r11648 - in packages/trunk/rott/debian: . patches

[Fabian Greffrath]

Author: fabian-guest
Date: 2011-01-10 08:45:32 +0000 (Mon, 10 Jan 2011)
New Revision: 11648

Added:
   packages/trunk/rott/debian/patches/04-objs-depend-on-develop_h.patch
Modified:
   packages/trunk/rott/debian/changelog
   packages/trunk/rott/debian/patches/series
   packages/trunk/rott/debian/rules
Log:
Make sure object files get rebuilt whenever develop.h is changed.

Modified: packages/trunk/rott/debian/changelog
===================================================================
--- packages/trunk/rott/debian/changelog	2011-01-09 22:18:56 UTC (rev 11647)
+++ packages/trunk/rott/debian/changelog	2011-01-10 08:45:32 UTC (rev 11648)
@@ -11,6 +11,7 @@
   * Fix another typo (parameter) spotted by lintian.
   * Remove the debug package, it has never been of any use.
   * Update Standards-Version and debhelper compat.
+  * Make sure object files get rebuilt whenever develop.h is changed.
 
  -- Fabian Greffrath <fabian+debian at greffrath.com>  Mon, 03 Jan 2011 16:36:05 +0100
 

Added: packages/trunk/rott/debian/patches/04-objs-depend-on-develop_h.patch
===================================================================
--- packages/trunk/rott/debian/patches/04-objs-depend-on-develop_h.patch	                        (rev 0)
+++ packages/trunk/rott/debian/patches/04-objs-depend-on-develop_h.patch	2011-01-10 08:45:32 UTC (rev 11648)
@@ -0,0 +1,26 @@
+Description: Make sure object files get rebuilt whenever develop.h is changed.
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+
+--- rott-1.1.1.orig/rott/Makefile
++++ rott-1.1.1/rott/Makefile
+@@ -60,7 +60,7 @@ all: rott
+ audiolib/audiolib.a:
+ 	$(MAKE) -C audiolib CC="$(CC)" CFLAGS="$(ALL_CFLAGS)" LDLIBS="$(LDLIBS)"
+ 
+-rott: 	\
++OBJS = \
+ 	cin_actr.o \
+ 	cin_efct.o \
+ 	cin_evnt.o \
+@@ -110,8 +110,10 @@ rott: 	\
+ 	z_zone.o \
+ 	byteordr.o \
+ 	dukemusc.o \
+-	audiolib/audiolib.a \
+ 	winrott.o
++
++$(OBJS): develop.h
++rott: $(OBJS) audiolib/audiolib.a
+ 	$(CC) $^ $(LDLIBS) -o $@
+ 
+ clean:

Modified: packages/trunk/rott/debian/patches/series
===================================================================
--- packages/trunk/rott/debian/patches/series	2011-01-09 22:18:56 UTC (rev 11647)
+++ packages/trunk/rott/debian/patches/series	2011-01-10 08:45:32 UTC (rev 11648)
@@ -3,4 +3,5 @@
 01-demo-datadir.patch
 02-persistent-typo.patch
 03-parameter-typo.patch
+04-objs-depend-on-develop_h.patch
 10-all-variants.patch

Modified: packages/trunk/rott/debian/rules
===================================================================
--- packages/trunk/rott/debian/rules	2011-01-09 22:18:56 UTC (rev 11647)
+++ packages/trunk/rott/debian/rules	2011-01-10 08:45:32 UTC (rev 11648)
@@ -14,7 +14,6 @@
 	    -i rott/develop.h
 	dh_auto_build
 	mv -fv rott/rott rott/rott-shareware
-	dh_auto_clean
 	# Commercial Version
 	sed -e "s/^\(#define SHAREWARE\).*/\1   0/" \
 	    -e "s/^\(#define SUPERROTT\).*/\1   0/" \
@@ -22,7 +21,6 @@
 	    -i rott/develop.h
 	dh_auto_build
 	mv -fv rott/rott rott/rott-commercial
-	dh_auto_clean
 	# CD Version
 	sed -e "s/^\(#define SHAREWARE\).*/\1   0/" \
 	    -e "s/^\(#define SUPERROTT\).*/\1   1/" \
@@ -30,7 +28,6 @@
 	    -i rott/develop.h
 	dh_auto_build
 	mv -fv rott/rott rott/rott-superrott
-	dh_auto_clean
 	# Site License CD Version
 	sed -e "s/^\(#define SHAREWARE\).*/\1   0/" \
 	    -e "s/^\(#define SUPERROTT\).*/\1   0/" \