r3979 - in packages/trunk/titanion/debian: . patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-08-29 19:01:31 +0000 (Wed, 29 Aug 2007)
New Revision: 3979

Added:
   packages/trunk/titanion/debian/patches/makefile.patch
Modified:
   packages/trunk/titanion/debian/patches/fix.diff
   packages/trunk/titanion/debian/patches/series
   packages/trunk/titanion/debian/rules
Log:
Modified building system



Modified: packages/trunk/titanion/debian/patches/fix.diff
===================================================================
--- packages/trunk/titanion/debian/patches/fix.diff	2007-08-29 18:56:30 UTC (rev 3978)
+++ packages/trunk/titanion/debian/patches/fix.diff	2007-08-29 19:01:31 UTC (rev 3979)
@@ -1,38 +1,3 @@
-Index: titanion-0.3.dfsg1/Makefile
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ titanion-0.3.dfsg1/Makefile	2007-08-29 19:46:43.000000000 +0200
-@@ -0,0 +1,30 @@
-+DC=gdmd
-+#DC=gdc
-+ifeq ($(DC), gdmd)
-+DFLAGS=-O -release -Iimport -Isrc
-+#DFLAGS=-g -debug -Iimport -Isrc
-+DOUT=-of
-+else
-+DFLAGS=-O -frelease -Iimport -Isrc
-+#DFLAGS=-g -fdebug -Iimport -Isrc
-+DOUT=-o
-+endif
-+
-+DSRC=$(shell find src/abagames -name "*.d")
-+SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d
-+OBJS=$(SOURCES:.d=.o)
-+EXE=titanion
-+
-+all: $(EXE)
-+
-+$(EXE): $(OBJS)
-+	gcc -o $@ $(OBJS) -lgphobos -lpthread -lm -lSDL -lGL -lGLU -lSDL_mixer
-+
-+$(OBJS):
-+	$(DC) -c -op $(DFLAGS) $(SOURCES)
-+
-+#$(OBJS): %.o: %.d
-+#	$(DC) -c $(DOUT)$@ $(DFLAGS) $<
-+
-+clean:
-+	rm -f $(OBJS) $(EXE)
 Index: titanion-0.3.dfsg1/src/abagames/ttn/bullet.d
 ===================================================================
 --- titanion-0.3.dfsg1.orig/src/abagames/ttn/bullet.d	2007-08-29 19:46:41.000000000 +0200

Added: packages/trunk/titanion/debian/patches/makefile.patch
===================================================================
--- packages/trunk/titanion/debian/patches/makefile.patch	                        (rev 0)
+++ packages/trunk/titanion/debian/patches/makefile.patch	2007-08-29 19:01:31 UTC (rev 3979)
@@ -0,0 +1,35 @@
+Index: titanion-0.3.dfsg1/Makefile
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ titanion-0.3.dfsg1/Makefile	2007-08-29 18:59:41.000000000 +0000
+@@ -0,0 +1,30 @@
++DC=gdmd
++#DC=gdc
++ifeq ($(DC), gdmd)
++DFLAGS=-O -release
++#DFLAGS=-g -debug
++DOUT=-of
++else
++DFLAGS=-O -frelease
++#DFLAGS=-g -fdebug
++DOUT=-o
++endif
++
++DSRC=$(shell find src/abagames -name "*.d")
++SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d
++OBJS=$(SOURCES:.d=.o)
++EXE=titanion
++
++all: $(EXE)
++
++$(EXE): $(OBJS)
++	gcc -o $@ $(OBJS) -lgphobos -lpthread -lm -lSDL -lGL -lGLU -lSDL_mixer
++
++$(OBJS):
++	$(DC) -c -op $(DFLAGS) -Iimport -Isrc $(SOURCES)
++
++#$(OBJS): %.o: %.d
++#	$(DC) -c $(DOUT)$@ $(DFLAGS) $<
++
++clean:
++	rm -f $(OBJS) $(EXE)

Modified: packages/trunk/titanion/debian/patches/series
===================================================================
--- packages/trunk/titanion/debian/patches/series	2007-08-29 18:56:30 UTC (rev 3978)
+++ packages/trunk/titanion/debian/patches/series	2007-08-29 19:01:31 UTC (rev 3979)
@@ -3,3 +3,4 @@
 windowed.patch
 dotfile.patch
 window-resize.patch
+makefile.patch

Modified: packages/trunk/titanion/debian/rules
===================================================================
--- packages/trunk/titanion/debian/rules	2007-08-29 18:56:30 UTC (rev 3978)
+++ packages/trunk/titanion/debian/rules	2007-08-29 19:01:31 UTC (rev 3979)
@@ -7,8 +7,10 @@
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
+	DFLAGS = -g -debug -d
 else
 	CFLAGS += -O2
+	DFLAGS = -O -release -d
 endif
 
 configure: configure-stamp
@@ -20,13 +22,16 @@
 build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
-	$(MAKE)
+	#ant -v
+	$(MAKE) CFLAGS="$(CFLAGS)" DFLAGS="$(DFLAGS)"
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
+	#ant -v clean
+	[ ! -f Makefile ] || $(MAKE) clean
 	rm -f titanion
 	rm -f `find . -name "*.o"`
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch