remove pre-compiled textshapes and transportation galleries.

Further gnumake fixups, package the files in the Gallery rules.

Change-Id: Icda2de9cfcd2ff573db2e9ab27e2670dcfa5f0a8

extras/Gallery_sound.mk

@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/sounds))
 
-$(eval $(call gb_Gallery_add_files,sound,\
+$(eval $(call gb_Gallery_add_files,sound,share/gallery/sounds,\
 	extras/source/gallery/sounds/apert2.wav \
 	extras/source/gallery/sounds/apert.wav \
 	extras/source/gallery/sounds/applause.wav \

extras/Gallery_transportation.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Gallery_Gallery,transportation,extras/source/gallery/transportation))
 
-$(eval $(call gb_Gallery_add_files,transportation,\
+$(eval $(call gb_Gallery_add_files,transportation,share/gallery/transportation,\
     extras/source/gallery/transportation/Airplane-Blue.png \
     extras/source/gallery/transportation/Bicycle-Blue.png \
     extras/source/gallery/transportation/Boat.png \

extras/Gallery_txtshapes.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Gallery_Gallery,txtshapes,extras/source/gallery/txtshapes))
 
-$(eval $(call gb_Gallery_add_files,txtshapes,\
+$(eval $(call gb_Gallery_add_files,txtshapes,share/gallery/txtshapes,\
     extras/source/gallery/txtshapes/Circle01-DarkBlue.png \
     extras/source/gallery/txtshapes/Circle02-LightBlue.png \
     extras/source/gallery/txtshapes/Circle03-Green.png \

extras/Module_extras.mk

@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,extras,\
 	Package_gallmytheme \
 	Package_gallpeople \
 	Package_gallroot \
-	Package_gallsounds \
 	Package_gallsymbols \
 	Package_gallsystem \
 	Package_gallwwwback \

extras/Package_gallsounds.mk

@@ -1,52 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,extras_gallsounds,$(SRCDIR)/extras/source/gallery/sounds))
-
-$(eval $(call gb_Package_set_outdir,extras_gallsounds,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,extras_gallsounds,share/gallery/sounds,\
-	apert2.wav \
-	apert.wav \
-	applause.wav \
-	beam2.wav \
-	beam.wav \
-	cow.wav \
-	curve.wav \
-	drama.wav \
-	explos.wav \
-	falling.wav \
-	glasses.wav \
-	gong.wav \
-	horse.wav \
-	kling.wav \
-	kongas.wav \
-	laser.wav \
-	left.wav \
-	nature1.wav \
-	nature2.wav \
-	ok.wav \
-	pluck.wav \
-	roll.wav \
-	romans.wav \
-	soft.wav \
-	space2.wav \
-	space3.wav \
-	space.wav \
-	sparcle.wav \
-	strom.wav \
-	theetone.wav \
-	top.wav \
-	train.wav \
-	untie.wav \
-	ups.wav \
-	wallewal.wav \
-))
-
-# vim: set noet sw=4 ts=4:

extras/Package_gallsystem.mk

@@ -45,12 +45,6 @@ $(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\
 	sg17.sdg \
 	sg17.sdv \
 	sg17.thm \
-	sg18.sdg \
-	sg18.sdv \
-	sg18.thm \
-	sg19.sdg \
-	sg19.sdv \
-	sg19.thm \
 	sg24.sdg \
 	sg24.sdv \
 	sg24.thm \

scp2/inc/macros.inc

@@ -430,6 +430,12 @@ File gid_File_Extra_Gall##id \
     TXT_FILE_BODY; \
     Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \
     Name = STRING(CONCAT3(Gallery/,id,.filelist)); \
+End \
+File gid_File_Extra_GallFiles##id \
+    Dir = FILELIST_DIR; \
+    TXT_FILE_BODY; \
+    Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \
+    Name = STRING(CONCAT3(Gallery/Files/,id,.filelist)); \
 End
 
 

solenv/gbuild/Gallery.mk

@@ -95,7 +95,10 @@ $(call gb_Gallery_get_clean_target,%) :
 			$(call gb_Gallery_get_workdir,$*) \
 	)
 
+# the theme package
 gb_Gallery_get_packagename = Gallery/$(1)
+# the files package
+gb_Gallery_get_files_packagename = Gallery/Files/$(1)
 
 # Create a gallery.
 #
@@ -106,6 +109,10 @@ gb_Gallery_get_packagename = Gallery/$(1)
 define gb_Gallery_Gallery
 $(call gb_Gallery__Gallery_impl,$(1),$(call gb_Gallery_get_packagename,$(1)),$(2),$(3))
 
+# setup the files package - we install all of these too
+$(call gb_Package_Package_internal,$(call gb_Gallery_get_files_packagename,$(1)),$(SRCDIR)/$(2))
+$(call gb_Package_set_outdir,$(call gb_Gallery_get_files_packagename,$(1)),$(INSTDIR))
+
 endef
 
 
@@ -129,6 +136,7 @@ $(call gb_Gallery_get_workdir,$(1))/$(1).sdg \
 $(call gb_Gallery_get_workdir,$(1))/$(1).sdv \
 $(call gb_Gallery_get_workdir,$(1))/$(1).thm : $(call gb_Gallery_get_target,$(1))
 $(call gb_Gallery__get_final_target,$(1)) : $(call gb_Package_get_target,$(2))
+
 $(call gb_Gallery_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2))
 $(call gb_Gallery_get_target,$(1)) :| $(dir $(call gb_Gallery_get_target,$(1))).dir \
 	$(call gb_Gallery_get_workdir,$(1))/.dir
@@ -169,8 +177,9 @@ endef
 #
 # gb_Gallery_add_file gallery file
 define gb_Gallery_add_file
-$(call gb_Gallery_get_target,$(1)) : $(SRCDIR)/$(2)
-$(call gb_Gallery_get_target,$(1)) : GALLERY_FILES += $(call gb_Helper_make_url,$(SRCDIR)/$(2))
+$(call gb_Gallery_get_target,$(1)) : $(SRCDIR)/$(3)
+$(call gb_Gallery_get_target,$(1)) : GALLERY_FILES += $(call gb_Helper_make_url,$(SRCDIR)/$(3))
+$(call gb_Package_add_file,$(call gb_Gallery_get_files_packagename,$(1)),$(2)/$(notdir $(3)),$(notdir $(3)))
 
 endef
 
@@ -180,7 +189,7 @@ endef
 #
 # gb_Gallery_add_files gallery file(s)
 define gb_Gallery_add_files
-$(foreach fname,$(2),$(call gb_Gallery_add_file,$(1),$(fname)))
+$(foreach fname,$(3),$(call gb_Gallery_add_file,$(1),$(2),$(fname)))
 
 endef
 

solenv/gbuild/Package.mk

@@ -127,6 +127,7 @@ gb_Package_OUTDIR_$(1) := $(2)
 endef
 
 define gb_Package_add_file
+$(info gb_Package_add_file,$(1), $(2), $(3), $(4))
 $(call gb_Package__check,$(1))
 $(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_file requires 3 arguments))
 $(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2)