[debian-edu-commits] debian-edu/ 157/437: * Rewrite build rules for art/splash/ to handle more images, and be more dynamic. Remove code to install grub splash image. It does not work. Install the new debian-edu-splash-live.png image.

Mike Gabriel sunweaver at debian.org
Sun Mar 2 23:49:32 UTC 2014


This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository debian-edu-artwork.

commit cf4cc8bfcb24ce57be3c1b5a693e987bb28adeb3
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Sep 8 08:16:17 2007 +0000

      * Rewrite build rules for art/splash/ to handle more images, and be
        more dynamic.  Remove code to install grub splash image.  It does
        not work.  Install the new debian-edu-splash-live.png image.
---
 art/splash/Makefile.am | 33 ++++++++++++++++++++++-----------
 art/splash/Makefile.in | 46 +++++++++++++++++++++++++++++-----------------
 debian/changelog       |  3 +++
 3 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/art/splash/Makefile.am b/art/splash/Makefile.am
index 648b271..412620b 100644
--- a/art/splash/Makefile.am
+++ b/art/splash/Makefile.am
@@ -1,4 +1,9 @@
-SPLASH = debian-edu-splash.png
+SPLASH = debian-edu-splash.png debian-edu-splash-live.png
+
+XPMS = $(SPLASH:.png=.xpm)
+XPMGZS = $(SPLASH:.png=.xpm.gz)
+
+RLES = $(SPLASH:.png=.rle)
 
 splashdir = $(datadir)/pixmaps/splash
 splash_DATA = $(SPLASH) 
@@ -6,22 +11,28 @@ splash_DATA = $(SPLASH)
 grubdir       = /boot/grub
 grubsplashdir = $(grubdir)/splashimages
 
-install-data-local: debian-edu-splash.xpm.gz
+BUILT_SOURCES = $(XPMGZS) $(RLES)
+
+install-data-local: $(XPMGZS)
 	$(mkinstalldirs) $(DESTDIR)$(splashdir)
 
 # Make it available as a grub splash image, detected and used by update-grub
-	$(mkinstalldirs) $(DESTDIR)$(grubsplashdir)
-	$(INSTALL_DATA) debian-edu-splash.xpm.gz \
-	   $(DESTDIR)$(grubsplashdir)/debian-edu-splash.xpm.gz
-	ln -s $(grubsplashdir)/splash.xpm.gz  $(DESTDIR)$(grubdir)/splash.xpm.gz 
+# This do not quite work yes.
+#	$(mkinstalldirs) $(DESTDIR)$(grubsplashdir)
+#	for file in $(XPMGZS) ; do \
+#	  $(INSTALL_DATA) $$file $(DESTDIR)$(grubsplashdir)/$$file ; \
+#	done
+#	ln -s $(grubsplashdir)/splash.xpm.gz  $(DESTDIR)$(grubdir)/splash.xpm.gz ;
 
-debian-edu-splash.xpm.gz: debian-edu-splash.png
-	convert debian-edu-splash.png debian-edu-splash.xpm
-	gzip -9 debian-edu-splash.xpm
+SUFFIXES = .png .rle .xpm .xpm.gz
 
-debian-edu-splash.rle: debian-edu-splash.png
+.png.rle:
 	pngtopnm < $^ | ppmquant 16 | ppmtolss16 "#ffffff=7" "#000000=0" > $@
+.png.xpm:
+	convert $^ $@
+.xpm.xpm.gz:
+	gzip -9 < $^ > $@
 
 EXTRA_DIST = $(splash_DATA)
 
-CLEANFILES = debian-edu-splash.xpm.gz debian-edu-splash.rle
+CLEANFILES = $(RLES) $(XPMS) $(XPMGZS)
diff --git a/art/splash/Makefile.in b/art/splash/Makefile.in
index 9cbb3b5..ac80d83 100644
--- a/art/splash/Makefile.in
+++ b/art/splash/Makefile.in
@@ -135,16 +135,31 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SPLASH = debian-edu-splash.png
+SPLASH = debian-edu-splash.png debian-edu-splash-live.png
+XPMS = $(SPLASH:.png=.xpm)
+XPMGZS = $(SPLASH:.png=.xpm.gz)
+RLES = $(SPLASH:.png=.rle)
 splashdir = $(datadir)/pixmaps/splash
 splash_DATA = $(SPLASH) 
 grubdir = /boot/grub
 grubsplashdir = $(grubdir)/splashimages
+BUILT_SOURCES = $(XPMGZS) $(RLES)
+
+# Make it available as a grub splash image, detected and used by update-grub
+# This do not quite work yes.
+#	$(mkinstalldirs) $(DESTDIR)$(grubsplashdir)
+#	for file in $(XPMGZS) ; do \
+#	  $(INSTALL_DATA) $$file $(DESTDIR)$(grubsplashdir)/$$file ; \
+#	done
+#	ln -s $(grubsplashdir)/splash.xpm.gz  $(DESTDIR)$(grubdir)/splash.xpm.gz ;
+SUFFIXES = .png .rle .xpm .xpm.gz
 EXTRA_DIST = $(splash_DATA)
-CLEANFILES = debian-edu-splash.xpm.gz debian-edu-splash.rle
-all: all-am
+CLEANFILES = $(RLES) $(XPMS) $(XPMGZS)
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
+.SUFFIXES: .png .rle .xpm .xpm.gz
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -227,13 +242,15 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(splashdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -258,6 +275,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -315,21 +333,15 @@ uninstall-am: uninstall-info-am uninstall-splashDATA
 	uninstall-splashDATA
 
 
-install-data-local: debian-edu-splash.xpm.gz
+install-data-local: $(XPMGZS)
 	$(mkinstalldirs) $(DESTDIR)$(splashdir)
 
-# Make it available as a grub splash image, detected and used by update-grub
-	$(mkinstalldirs) $(DESTDIR)$(grubsplashdir)
-	$(INSTALL_DATA) debian-edu-splash.xpm.gz \
-	   $(DESTDIR)$(grubsplashdir)/debian-edu-splash.xpm.gz
-	ln -s $(grubsplashdir)/splash.xpm.gz  $(DESTDIR)$(grubdir)/splash.xpm.gz 
-
-debian-edu-splash.xpm.gz: debian-edu-splash.png
-	convert debian-edu-splash.png debian-edu-splash.xpm
-	gzip -9 debian-edu-splash.xpm
-
-debian-edu-splash.rle: debian-edu-splash.png
+.png.rle:
 	pngtopnm < $^ | ppmquant 16 | ppmtolss16 "#ffffff=7" "#000000=0" > $@
+.png.xpm:
+	convert $^ $@
+.xpm.xpm.gz:
+	gzip -9 < $^ > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/debian/changelog b/debian/changelog
index 2e898b5..02fa4e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ debian-edu-artwork (0.0.21.0.edu.etch.3) unstable; urgency=low
 
   [ Petter Reinholdtsen ]
   * Build-depend on syslinux for ppmtolss16.
+  * Rewrite build rules for art/splash/ to handle more images, and be
+    more dynamic.  Remove code to install grub splash image.  It does
+    not work.  Install the new debian-edu-splash-live.png image.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat,  8 Sep 2007 10:02:45 +0200
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git



More information about the debian-edu-commits mailing list