r3953 - in packages/trunk/gunroar/debian: . patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-08-29 17:37:08 +0000 (Wed, 29 Aug 2007)
New Revision: 3953

Modified:
   packages/trunk/gunroar/debian/changelog
   packages/trunk/gunroar/debian/patches/makefile.patch
   packages/trunk/gunroar/debian/rules
Log:
Improved Makefile
Added -v to ant



Modified: packages/trunk/gunroar/debian/changelog
===================================================================
--- packages/trunk/gunroar/debian/changelog	2007-08-29 17:34:59 UTC (rev 3952)
+++ packages/trunk/gunroar/debian/changelog	2007-08-29 17:37:08 UTC (rev 3953)
@@ -4,6 +4,7 @@
   * Added copyright and license statements to the patches.
   * Added XS-Vcs-Svn and XS-Vcs-Browser to control.
   * Added patch to create Makefile
+  * Added verbose switch (-v) to ant.
 
  -- Miriam Ruiz <little_miry at yahoo.es>  Sun, 26 Aug 2007 16:23:45 +0000
 

Modified: packages/trunk/gunroar/debian/patches/makefile.patch
===================================================================
--- packages/trunk/gunroar/debian/patches/makefile.patch	2007-08-29 17:34:59 UTC (rev 3952)
+++ packages/trunk/gunroar/debian/patches/makefile.patch	2007-08-29 17:37:08 UTC (rev 3953)
@@ -1,39 +1,45 @@
-Index: gunroar-0.15.dfsg1/Makefile
+# Copyright (C) 2007  Miriam Ruiz <little_miry at yahoo.es>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: a7xpg-0.11.dfsg1/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gunroar-0.15.dfsg1/Makefile	2007-08-29 16:57:24.000000000 +0000
-@@ -0,0 +1,34 @@
-+DSRC=$(shell find src -name "*.d")
-+SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d
-+OBJS=$(SOURCES:.d=.o)
-+CSOURCES=$(shell find src -name "*.c")
-+COBJS=$(CSOURCES:.c=.o)
-+LDFLAGS=
-+CFLAGS=-O2 -Wall
-+DFLAGS=-O -release
-+#DFLAGS=-g -debug
-+CC=gcc
-+DC=gdmd
-+LIBS=-lgphobos -lpthread -lGLU -lGL -lm -lstdc++ `sdl-config --libs` -lSDL_mixer
-+EXE=gunroar
-+
-+all: $(EXE)
-+
-+$(EXE): $(OBJS) $(COBJS)
-+	$(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
-+
-+$(OBJS): %.o: %.d
-+	$(DC) -d -c -of$@ $(DFLAGS) -Iimport -Isrc -I/usr/X11R6/include/ $<
-+
-+$(COBJS): %.o: %.c
-+	$(CC) -c -o $@ $(CFLAGS) `sdl-config --cflags` $<
-+
-+src/dirent_d.o: src/dirent_d.c
-+	gcc -c $< -o $@
-+
-+clean:
-+	$(RM) -f src/*.o
-+	$(RM) -f src/abagames/a7xpg/*.o
-+	$(RM) -f src/abagames/util/*.o
-+	$(RM) -f src/abagames/util/sdl/*.o
++++ a7xpg-0.11.dfsg1/Makefile	2007-08-29 17:32:50.000000000 +0000
+@@ -0,0 +1,37 @@
++
++SOURCES=$(shell find src -name "*.d")
++OBJS=$(SOURCES:.d=.o)
++LSOURCES=$(shell find import -name "*.d")
++LOBJS=$(LSOURCES:.d=.o)
++CSOURCES=$(shell find src -name "*.c")
++COBJS=$(CSOURCES:.c=.o)
++
++LDFLAGS=
++CFLAGS=-O2 -Wall
++DFLAGS=-O -release
++#DFLAGS=-g -debug
++CC=gcc
++DC=gdmd
++LIBS=-lgphobos -lGLU -lGL `sdl-config --libs` -lSDL_mixer -lpthread -lm -lstdc++ 
++EXE=gunroar
++
++all: $(EXE)
++
++$(EXE): $(LOBJS) $(OBJS) $(COBJS)
++	gdc $(LDFLAGS) -o $@ $+ $(LIBS)
++
++$(LOBJS): %.o: %.d
++	$(DC) -d -c -of$@ $(DFLAGS) -Iimport $<
++
++$(OBJS): %.o: %.d
++	$(DC) -d -c -of$@ $(DFLAGS) -Iimport -Isrc $<
++
++$(COBJS): %.o: %.c
++	$(CC) -c -o $@ $(CFLAGS) `sdl-config --cflags` $<
++
++clean:
++	$(RM) -f src/*.o
++	$(RM) -f src/abagames/a7xpg/*.o
++	$(RM) -f src/abagames/util/*.o
++	$(RM) -f src/abagames/util/sdl/*.o
 +	$(RM) -f import/*.o

Modified: packages/trunk/gunroar/debian/rules
===================================================================
--- packages/trunk/gunroar/debian/rules	2007-08-29 17:34:59 UTC (rev 3952)
+++ packages/trunk/gunroar/debian/rules	2007-08-29 17:37:08 UTC (rev 3953)
@@ -20,7 +20,7 @@
 build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
-	ant
+	ant -v
 	#docbook-to-man debian/gunroar.sgml > gunroar.1
 	touch $@
 
@@ -28,7 +28,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	ant clean
+	ant -v clean
 	rm -f gunroar
 	rm -f `find . -name "*.o"`
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch