remove pre-compiled textshapes and transportation galleries.

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

Change-Id: Icda2de9cfcd2ff573db2e9ab27e2670dcfa5f0a8

12 files changed, 3 insertions, 62 deletions

diff --git a/extras/Gallery_sound.mk b/extras/Gallery_sound.mk
index 358da05a774c..b48a2f05d392 100644
--- a/extras/Gallery_sound.mk
+++ b/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 \
diff --git a/extras/Gallery_transportation.mk b/extras/Gallery_transportation.mk
index 8b84c9637171..605782f4ab77 100644
--- a/extras/Gallery_transportation.mk
+++ b/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 \
diff --git a/extras/Gallery_txtshapes.mk b/extras/Gallery_txtshapes.mk
index 85645a504955..df8bc3a32c53 100644
--- a/extras/Gallery_txtshapes.mk
+++ b/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 \
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 3551ce02606f..a92c3072de88 100644
--- a/extras/Module_extras.mk
+++ b/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 \
diff --git a/extras/Package_gallsounds.mk b/extras/Package_gallsounds.mk
deleted file mode 100644
index 61a093f9f4e0..000000000000
--- a/extras/Package_gallsounds.mk
+++ /dev/null
@@ -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:
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index 441dbfd585bb..eaf925410c59 100644
--- a/extras/Package_gallsystem.mk
+++ b/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 \
diff --git a/extras/source/gallery/gallery_system/sg18.sdg b/extras/source/gallery/gallery_system/sg18.sdg
deleted file mode 100755
index fb0bf91c5651..000000000000
--- a/extras/source/gallery/gallery_system/sg18.sdg
+++ /dev/null
diff --git a/extras/source/gallery/gallery_system/sg18.sdv b/extras/source/gallery/gallery_system/sg18.sdv
deleted file mode 100755
index 444959152744..000000000000
--- a/extras/source/gallery/gallery_system/sg18.sdv
+++ /dev/null
diff --git a/extras/source/gallery/gallery_system/sg18.thm b/extras/source/gallery/gallery_system/sg18.thm
deleted file mode 100755
index 4683a2fb5ede..000000000000
--- a/extras/source/gallery/gallery_system/sg18.thm
+++ /dev/null
diff --git a/extras/source/gallery/gallery_system/sg19.sdg b/extras/source/gallery/gallery_system/sg19.sdg
deleted file mode 100755
index c140012d26be..000000000000
--- a/extras/source/gallery/gallery_system/sg19.sdg
+++ /dev/null
diff --git a/extras/source/gallery/gallery_system/sg19.sdv b/extras/source/gallery/gallery_system/sg19.sdv
deleted file mode 100755
index 444959152744..000000000000
--- a/extras/source/gallery/gallery_system/sg19.sdv
+++ /dev/null
diff --git a/extras/source/gallery/gallery_system/sg19.thm b/extras/source/gallery/gallery_system/sg19.thm
deleted file mode 100755
index 6aa8926119a3..000000000000
--- a/extras/source/gallery/gallery_system/sg19.thm
+++ /dev/null