applnk: configure.in, pixmaps/Makefile.am, pixmaps/scalable/Makefile.am (RE...

[baggins]

Author: baggins                      Date: Sun May 16 22:13:04 2010 GMT
Module: applnk                        Tag: HEAD
---- Log message:
- list manually svg files in pixmaps/Makefile.am
- drop pixmaps/scalable/Makefile.am, this directory is listed/packaged
  in pixmaps/Makefile.am

---- Files affected:
applnk:
   configure.in (1.50 -> 1.51) 
applnk/pixmaps:
   Makefile.am (1.36 -> 1.37) 
applnk/pixmaps/scalable:
   Makefile.am (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: applnk/configure.in
diff -u applnk/configure.in:1.50 applnk/configure.in:1.51
--- applnk/configure.in:1.50	Sun May 16 23:52:11 2010
+++ applnk/configure.in	Mon May 17 00:12:59 2010
@@ -17,5 +17,4 @@
 	Makefile
 	desktop-directories/Makefile
 	menus/Makefile
-	pixmaps/Makefile
-	pixmaps/scalable/Makefile])
+	pixmaps/Makefile])

================================================================
Index: applnk/pixmaps/Makefile.am
diff -u applnk/pixmaps/Makefile.am:1.36 applnk/pixmaps/Makefile.am:1.37
--- applnk/pixmaps/Makefile.am:1.36	Mon May 17 00:01:38 2010
+++ applnk/pixmaps/Makefile.am	Mon May 17 00:12:59 2010
@@ -1,12 +1,86 @@
 
-SUBDIRS = scalable
-
 pixmapsdir = $(datadir)/pixmaps
 
-svg_pixmaps = $(wildcard scalable/*.svg)
+svg_pixmaps = \
+	scalable/package-accessories-accessibility.svg \
+	scalable/package-accessories-archiving.svg \
+	scalable/package-accessories-calculator.svg \
+	scalable/package-accessories-clock.svg \
+	scalable/package-accessories-docklet.svg \
+	scalable/package-accessories-editor.svg \
+	scalable/package-accessories-electronics.svg \
+	scalable/package-accessories-emulator.svg \
+	scalable/package-accessories-engineering.svg \
+	scalable/package-accessories-filemanager.svg \
+	scalable/package-accessories.svg \
+	scalable/package-applications.svg \
+	scalable/package-development-debugger.svg \
+	scalable/package-development-i18n.svg \
+	scalable/package-development-ide.svg \
+	scalable/package-development-project.svg \
+	scalable/package-development.svg \
+	scalable/package-development-webdesign.svg \
+	scalable/package-education.svg \
+	scalable/package-games-action.svg \
+	scalable/package-games-adventure.svg \
+	scalable/package-games-amusements.svg \
+	scalable/package-games-arcade.svg \
+	scalable/package-games-blocks.svg \
+	scalable/package-games-board.svg \
+	scalable/package-games-cards.svg \
+	scalable/package-games-fpp.svg \
+	scalable/package-games-logic.svg \
+	scalable/package-games-racing.svg \
+	scalable/package-games-rpg.svg \
+	scalable/package-games-sim.svg \
+	scalable/package-games-sport.svg \
+	scalable/package-games-strategy.svg \
+	scalable/package-games.svg \
+	scalable/package-gnome.svg \
+	scalable/package-graphics-scan.svg \
+	scalable/package-graphics.svg \
+	scalable/package-graphics-viewer.svg \
+	scalable/package-kde.svg \
+	scalable/package-misc.svg \
+	scalable/package-multimedia-cd-rw.svg \
+	scalable/package-multimedia-editing.svg \
+	scalable/package-multimedia-mixer.svg \
+	scalable/package-multimedia-player.svg \
+	scalable/package-multimedia.svg \
+	scalable/package-multimedia-tuner.svg \
+	scalable/package-network-communications.svg \
+	scalable/package-network-dialup.svg \
+	scalable/package-network-ftp.svg \
+	scalable/package-network-mail.svg \
+	scalable/package-network-news.svg \
+	scalable/package-network-remote.svg \
+	scalable/package-network.svg \
+	scalable/package-network-www.svg \
+	scalable/package-office-database.svg \
+	scalable/package-office-dictionary.svg \
+	scalable/package-office-pda.svg \
+	scalable/package-office-pim.svg \
+	scalable/package-office-presentation.svg \
+	scalable/package-office-spreadsheet.svg \
+	scalable/package-office.svg \
+	scalable/package-office-wordprocessor.svg \
+	scalable/package-science.svg \
+	scalable/package-settings-gnome-accessibility.svg \
+	scalable/package-settings-gnome.svg \
+	scalable/package-settings-gnome-system.svg \
+	scalable/package-settings.svg \
+	scalable/package-settings-xfce.svg \
+	scalable/package-system-filesystem.svg \
+	scalable/package-system-monitor.svg \
+	scalable/package-system-network.svg \
+	scalable/package-system-security.svg \
+	scalable/package-system.svg \
+	scalable/package-terminals.svg \
+	scalable/package-xorg.svg
+
 png_pixmaps = $(patsubst scalable/%.svg,%.png,$(svg_pixmaps))
 
-EXTRA_DIST = $(png_pixmaps)
+EXTRA_DIST = $(svg_pixmaps) $(png_pixmaps)
 
 %.png: scalable/%.svg
 	inkscape -z -w 48 -h 48 -y 0.0 -d 90 -f $< -e $@
@@ -18,3 +92,4 @@
 install-data-local:
 	install -d -m755 $(DESTDIR)$(pixmapsdir)
 	$(install_sh_DATA) *.png $(DESTDIR)$(pixmapsdir)
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/applnk/configure.in?r1=1.50&r2=1.51&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/applnk/pixmaps/Makefile.am?r1=1.36&r2=1.37&f=u