r7756 - packages/trunk/game-data-packager

[Jon Dowland]

Author: jmtd-guest
Date: 2008-07-17 21:01:20 +0000 (Thu, 17 Jul 2008)
New Revision: 7756

Added:
   packages/trunk/game-data-packager/doom-common.mk
Removed:
   packages/trunk/game-data-packager/doom.mk
   packages/trunk/game-data-packager/doom2.mk
Modified:
   packages/trunk/game-data-packager/Makefile
Log:
further generalise to doom-common.mk

Modified: packages/trunk/game-data-packager/Makefile
===================================================================
--- packages/trunk/game-data-packager/Makefile	2008-07-17 20:48:59 UTC (rev 7755)
+++ packages/trunk/game-data-packager/Makefile	2008-07-17 21:01:20 UTC (rev 7756)
@@ -1,13 +1,11 @@
 VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2-)
 
-DOOMDEB=doom-wad_$(VERSION)_all.deb
-DOOM2DEB=doom2-wad_$(VERSION)_all.deb
+default:
+	make -f doom-common.mk IWAD=doom VERSION=$(VERSION)
+	make -f doom-common.mk IWAD=doom2 VERSION=$(VERSION)
 
-default: $(DOOM2DEB) $(DOOMDEB)
+clean:
+	make -f doom-common.mk IWAD=doom VERSION=$(VERSION) clean
+	make -f doom-common.mk IWAD=doom2 VERSION=$(VERSION) clean
 
-include doom.mk
-include doom2.mk
-
-clean: clean_doom2 clean_doom
-
-.PHONY: default clean fixperms
+.PHONY: default clean

Added: packages/trunk/game-data-packager/doom-common.mk
===================================================================
--- packages/trunk/game-data-packager/doom-common.mk	                        (rev 0)
+++ packages/trunk/game-data-packager/doom-common.mk	2008-07-17 21:01:20 UTC (rev 7756)
@@ -0,0 +1,38 @@
+# "IWAD" and "IWAD" are passed in by the parent make; e.g.
+# $(IWAD) and $(IWAD); or $(IWAD)2 and $(IWAD)2.
+
+$(IWAD)DEB=$(IWAD)-wad_$(VERSION)_all.deb
+
+$(IWAD)TARGETS := $(IWAD)-wad/DEBIAN/md5sums $(IWAD)-wad/DEBIAN/control $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/changelog.gz $(IWAD)-wad/usr/share/pixmaps/$(IWAD).xpm
+
+$($(IWAD)DEB): $($(IWAD)TARGETS) fixperms 
+	if [ `id -u` -eq 0 ]; then \
+		dpkg-deb -b $(IWAD)-wad $@ ; \
+	else \
+		fakeroot dpkg-deb -b $(IWAD)-wad $@; \
+	fi
+
+$(IWAD)-wad/DEBIAN/control:
+	cp $(IWAD)-wad/DEBIAN/control.in $(IWAD)-wad/DEBIAN/control
+	echo Version: $(VERSION) >> $(IWAD)-wad/DEBIAN/control
+
+$(IWAD)-wad/usr/share/doc/$(IWAD)-wad/changelog.gz:
+	gzip -c9 debian/changelog > $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/changelog.gz
+
+$(IWAD)-wad/usr/share/pixmaps/$(IWAD).xpm:
+	cp -p doom-common/doom2.xpm $(IWAD)-wad/usr/share/pixmaps/$(IWAD).xpm
+
+$(IWAD)-wad/DEBIAN/md5sums:
+	cd $(IWAD)-wad && find usr/ -type f -print0 |\
+		xargs -r0 md5sum >DEBIAN/md5sums
+
+fixperms:
+	find $(IWAD)-wad -type f -print0 | xargs -r0 chmod 644
+	find $(IWAD)-wad -type d -print0 | xargs -r0 chmod 755
+	chmod 755 $(IWAD)-wad/DEBIAN/postinst
+	chmod 755 $(IWAD)-wad/DEBIAN/prerm
+
+clean:
+	rm -f $($(IWAD)DEB) $($(IWAD)TARGETS)
+
+.PHONY: fixperms clean

Deleted: packages/trunk/game-data-packager/doom.mk
===================================================================
--- packages/trunk/game-data-packager/doom.mk	2008-07-17 20:48:59 UTC (rev 7755)
+++ packages/trunk/game-data-packager/doom.mk	2008-07-17 21:01:20 UTC (rev 7756)
@@ -1,31 +0,0 @@
-DOOMTARGETS := doom-wad/DEBIAN/md5sums doom-wad/DEBIAN/control doom-wad/usr/share/doc/doom-wad/changelog.gz doom-wad/usr/share/pixmaps/doom.xpm
-
-$(DOOMDEB): $(DOOMTARGETS) fixperms 
-	if [ `id -u` -eq 0 ]; then \
-		dpkg-deb -b doom-wad $@ ; \
-	else \
-		fakeroot dpkg-deb -b doom-wad $@; \
-	fi
-
-doom-wad/DEBIAN/control:
-	cp doom-wad/DEBIAN/control.in doom-wad/DEBIAN/control
-	echo Version: $(VERSION) >> doom-wad/DEBIAN/control
-
-doom-wad/usr/share/doc/doom-wad/changelog.gz:
-	gzip -c9 debian/changelog > doom-wad/usr/share/doc/doom-wad/changelog.gz
-
-doom-wad/usr/share/pixmaps/doom.xpm:
-	cp -p doom-common/doom2.xpm doom-wad/usr/share/pixmaps/doom.xpm
-
-doom-wad/DEBIAN/md5sums:
-	cd doom-wad && find usr/ -type f -print0 |\
-		xargs -r0 md5sum >DEBIAN/md5sums
-
-fixperms_doom:
-	find doom-wad -type f -print0 | xargs -r0 chmod 644
-	find doom-wad -type d -print0 | xargs -r0 chmod 755
-	chmod 755 doom-wad/DEBIAN/postinst
-	chmod 755 doom-wad/DEBIAN/prerm
-
-clean_doom:
-	rm -f $(DOOMDEB) $(DOOMTARGETS)

Deleted: packages/trunk/game-data-packager/doom2.mk
===================================================================
--- packages/trunk/game-data-packager/doom2.mk	2008-07-17 20:48:59 UTC (rev 7755)
+++ packages/trunk/game-data-packager/doom2.mk	2008-07-17 21:01:20 UTC (rev 7756)
@@ -1,31 +0,0 @@
-DOOM2TARGETS := doom2-wad/DEBIAN/md5sums doom2-wad/DEBIAN/control doom2-wad/usr/share/doc/doom2-wad/changelog.gz doom2-wad/usr/share/pixmaps/doom2.xpm
-
-$(DOOM2DEB): $(DOOM2TARGETS) fixperms 
-	if [ `id -u` -eq 0 ]; then \
-		dpkg-deb -b doom2-wad $@ ; \
-	else \
-		fakeroot dpkg-deb -b doom2-wad $@; \
-	fi
-
-doom2-wad/DEBIAN/control:
-	cp doom2-wad/DEBIAN/control.in doom2-wad/DEBIAN/control
-	echo Version: $(VERSION) >> doom2-wad/DEBIAN/control
-
-doom2-wad/usr/share/doc/doom2-wad/changelog.gz:
-	gzip -c9 debian/changelog > doom2-wad/usr/share/doc/doom2-wad/changelog.gz
-
-doom2-wad/usr/share/pixmaps/doom2.xpm:
-	cp -p doom-common/doom2.xpm doom2-wad/usr/share/pixmaps/doom2.xpm
-
-doom2-wad/DEBIAN/md5sums:
-	cd doom2-wad && find usr/ -type f -print0 |\
-		xargs -r0 md5sum >DEBIAN/md5sums
-
-fixperms_doom2:
-	find doom2-wad -type f -print0 | xargs -r0 chmod 644
-	find doom2-wad -type d -print0 | xargs -r0 chmod 755
-	chmod 755 doom2-wad/DEBIAN/postinst
-	chmod 755 doom2-wad/DEBIAN/prerm
-
-clean_doom2:
-	rm -f $(DOOM2DEB) $(DOOM2TARGETS)