[Pkg-nethack-devel] nethack changelog,1.35,1.36 rules,1.16,1.17

[Joshua Kwan]

Update of /cvsroot/pkg-nethack/nethack
In directory quantz:/tmp/cvs-serv21857

Modified Files:
	changelog rules 
Log Message:
big build system fixes from aaronl


Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/changelog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- changelog	26 Dec 2003 09:27:43 -0000	1.35
+++ changelog	27 Dec 2003 09:32:09 -0000	1.36
@@ -6,8 +6,10 @@
     - Remove old warnings and caveats in README.Debian that are obsoleted
       with 18_overridewin.dpatch. (i.e., stick windowtype:tty into your
       $NETHACKOPTIONS if you intend to set it)
+    - Applied a really great debian/rules simplification from
+      Aaron Lehmann <aaronl@vitelus.com>
 
- -- Joshua Kwan <joshk@triplehelix.org>  Mon, 22 Dec 2003 18:57:17 -0800
+ -- Joshua Kwan <joshk@triplehelix.org>  Sat, 27 Dec 2003 01:30:20 -0800
 
 nethack (3.4.3-2) unstable; urgency=medium
 

Index: rules
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/rules,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- rules	26 Dec 2003 09:27:43 -0000	1.16
+++ rules	27 Dec 2003 09:32:09 -0000	1.17
@@ -20,8 +20,13 @@
 
 export CFLAGS = $(optimize) -I../include -g -Wall -DGCC_WARN
 
+TARGETS = console lisp x11 gnome qt
+
+TARGET_NAMES = $(TARGETS:%=build-%)
+TARGET_STAMPS = $(TARGET_NAMES:%=%-stamp)
+
 build: patch-stamp build-stamp
-build-stamp: Makefile build-lisp build-console build-x11 build-gnome build-qt build-common
+build-stamp: $(TARGET_NAMES) build-common
 	touch build-stamp
 
 Makefile:
@@ -29,71 +34,20 @@
 # (in this case, 1) tells it to make symlinks.
 	sh sys/unix/setup.sh 1
 
-build-console: patch build-console-stamp
-build-console-stamp: Makefile
-	dh_testdir
-	dh_installdirs
-
-	touch include/config.h
-
-	$(MAKE) nethack WIN=tty
-
-	cp src/nethack debian/console
-
-	touch build-console-stamp
-
-build-lisp: patch Makefile build-lisp-stamp
-build-lisp-stamp: Makefile
-	dh_testdir
-	dh_installdirs
-
-	touch include/config.h
-
-	$(MAKE) nethack WIN=lisp
-	
-	cp src/nethack debian/lisp
-
-	touch build-lisp-stamp
+$(TARGET_NAMES): %: %-stamp
 
-build-x11: patch build-x11-stamp
-build-x11-stamp: Makefile
+$(TARGET_STAMPS): Makefile patch-stamp
 	dh_testdir
 	dh_installdirs
 
 	touch include/config.h
-	
-	$(MAKE) nethack WIN=x11
-
-	cp src/nethack debian/x11
-
-	touch build-x11-stamp
-
-build-gnome: patch build-gnome-stamp
-build-gnome-stamp: Makefile
-
-	-$(MAKE) clean
-
-	touch include/config.h
-
-	$(MAKE) nethack WIN=gnome
-
-	cp src/nethack debian/gnome
-	touch build-gnome-stamp
-
-build-qt: patch build-qt-stamp
-build-qt-stamp: Makefile
-	-$(MAKE) clean
-
-	touch include/config.h
-
-	$(MAKE) nethack WIN=qt
+	$(MAKE) nethack WIN=$(patsubst build-%-stamp,%,$@)
+	cp src/nethack debian/$(patsubst build-%-stamp,%,$@)
+	touch $@
 
-	cp src/nethack debian/qt
-	touch build-qt-stamp
+build-common: patch-stamp build-common-stamp
 
-build-common: patch build-common-stamp
-build-common-stamp: Makefile
-	
+build-common-stamp: Makefile $(TARGET_NAMES)
 	$(MAKE) CFLAGS="$(CFLAGS) -DUSE_XPM" \
 	  Guidebook data oracles options quest.dat rumors dungeon spec_levs \
 	  check-dlb x11tiles pet_mark.xbm rip.xpm mapbg.xpm
@@ -103,13 +57,11 @@
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	-rm -f build-stamp build-x11-stamp build-gnome-stamp build-qt-stamp \
-	  build-common-stamp build-console-stamp build-lisp-stamp
-	-rm -f nh10.pcf
-	-rm -f debian/gnome/nethack debian/qt/nethack debian/x11/nethack \
-	  debian/console/nethack debian/lisp/nethack
+	rm -f build-stamp build-common-stamp $(TARGET_STAMPS)
+	rm -f nh10.pcf
+	rm -f $(patsubst %,debian/%/nethack,$(TARGETS))
 	-$(MAKE) spotless
-	find . -name Makefile -print0 | xargs -r -0 rm
+	-find . -name Makefile -print0 | xargs -r -0 rm
 
 	dh_clean
 
@@ -156,7 +108,7 @@
 	done
 
 	# all shell scripts, nethack binaries, and nethackrcs
-	for flavor in console gnome x11 qt lisp; do \
+	for flavor in $(TARGETS); do \
 	  install -m 0755 -o root -g games debian/$$flavor/nethack.sh \
 	    debian/nethack-$$flavor/usr/lib/games/nethack/nethack-$$flavor.sh; \
 	  if [ -f "debian/$$flavor/nethack-tty.sh" ]; then \
@@ -203,5 +155,5 @@
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
 
+.PHONY: build build-common clean binary-indep binary-arch binary source diff install patch unpatch $(TARGET_NAMES)