gallery: fix a number of naming thinkos.

Change-Id: If5fe5af925bb2f8b7a5a11eb9d310668a3fd7085

extras/Gallery_arrows.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/arrows))
+$(eval $(call gb_Gallery_Gallery,arrows,extras/source/gallery/arrows))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/arrows,\
+$(eval $(call gb_Gallery_add_files,arrows,share/gallery/arrows,\
 	extras/source/gallery/arrows/A01-Arrow-Gray-Left.png \
 	extras/source/gallery/arrows/A02-Arrow-DarkBlue-Right.png \
 	extras/source/gallery/arrows/A03-Arrow-Gray-Left.png \

extras/Gallery_diagrams.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/diagrams))
+$(eval $(call gb_Gallery_Gallery,diagrams,extras/source/gallery/diagrams))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/diagrams,\
+$(eval $(call gb_Gallery_add_files,diagrams,share/gallery/diagrams,\
 	extras/source/gallery/diagrams/Component-Circle01-Transparent-DarkBlue.png \
 	extras/source/gallery/diagrams/Component-Circle02-Transparent-Bule.png \
 	extras/source/gallery/diagrams/Component-Circle03-Transparent-Green.png \

extras/Gallery_education.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/education))
+$(eval $(call gb_Gallery_Gallery,education,extras/source/gallery/education))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/education,\
+$(eval $(call gb_Gallery_add_files,education,share/gallery/education,\
 	extras/source/gallery/education/Blackboard.png \
 	extras/source/gallery/education/Books.png \
 	extras/source/gallery/education/Chalk.png \

extras/Gallery_environment.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/environment))
+$(eval $(call gb_Gallery_Gallery,environment,extras/source/gallery/environment))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/environment,\
+$(eval $(call gb_Gallery_add_files,environment,share/gallery/environment,\
 	extras/source/gallery/environment/DrippingFaucet.png \
 	extras/source/gallery/environment/Earth.png \
 	extras/source/gallery/environment/EndangeredAnimals1.png \

extras/Gallery_finance.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/finance))
+$(eval $(call gb_Gallery_Gallery,finance,extras/source/gallery/finance))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/finance,\
+$(eval $(call gb_Gallery_add_files,finance,share/gallery/finance,\
 	extras/source/gallery/finance/Agreement.png \
 	extras/source/gallery/finance/ATM01.png \
 	extras/source/gallery/finance/ATM02.png \

extras/Gallery_people.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/people))
+$(eval $(call gb_Gallery_Gallery,people,extras/source/gallery/people))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/people,\
+$(eval $(call gb_Gallery_add_files,people,share/gallery/people,\
 	extras/source/gallery/people/Artist-Female1.png \
 	extras/source/gallery/people/Artist-Female2.png \
 	extras/source/gallery/people/Artist-Male1.png \

extras/Gallery_sound.mk

@@ -8,9 +8,9 @@
 #
 # this should probably be done with more general rules: but how ?
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/sounds))
+$(eval $(call gb_Gallery_Gallery,sounds,extras/source/gallery/sounds))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/sounds,\
+$(eval $(call gb_Gallery_add_files,sounds,share/gallery/sounds,\
 	extras/source/gallery/sounds/apert2.wav \
 	extras/source/gallery/sounds/apert.wav \
 	extras/source/gallery/sounds/applause.wav \

extras/Gallery_symbols.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/symbols))
+$(eval $(call gb_Gallery_Gallery,symbols,extras/source/gallery/symbols))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/symbols,\
+$(eval $(call gb_Gallery_add_files,symbols,share/gallery/symbols,\
 	extras/source/gallery/symbols/Book.png \
 	extras/source/gallery/symbols/Box01.png \
 	extras/source/gallery/symbols/Box02.png \

extras/source/gallery/share/gallery_names.ulf

@@ -28,7 +28,7 @@ en-US = "Finance"
 [people]
 en-US = "People"
 
-[sound]
+[sounds]
 en-US = "Sounds"
 
 [symbols]

scp2/source/ooo/file_extra_ooo.scp

@@ -168,7 +168,7 @@ GALLERY_FILELIST(education)
 GALLERY_FILELIST(environment)
 GALLERY_FILELIST(finance)
 GALLERY_FILELIST(people)
-GALLERY_FILELIST(sound)
+GALLERY_FILELIST(sounds)
 GALLERY_FILELIST(symbols)
 GALLERY_FILELIST(transportation)
 GALLERY_FILELIST(txtshapes)

solenv/gbuild/Gallery.mk

@@ -112,6 +112,8 @@ $(call gb_Gallery__Gallery_impl,$(1),$(call gb_Gallery_get_packagename,$(1)),$(2
 # 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))
+$(call gb_Gallery__get_final_target,$(1)) : $(call gb_Package_get_target,$(call gb_Gallery_get_files_packagename,$(1)))
+$(call gb_Gallery_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_Gallery_get_files_packagename,$(1)))
 
 endef
 
@@ -158,7 +160,7 @@ $$(call gb_Gallery_get_workdir,$(1))/$(1).ulf : \
 	rm -rf $$$${MERGEINPUT}
 else
 $$(call gb_Gallery_get_workdir,$(1))/$(1).ulf : $$(call gb_Gallery_basedir,$(3))/share/gallery_names.ulf
-	cp $< $@
+	cp $$< $$@
 endif
 
 $(call gb_Gallery_get_workdir,$(1))/$(1).str : $(gb_Gallery_TRANSLATE) \