r3952 - in packages/trunk/a7xpg/debian: . patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-08-29 17:34:59 +0000 (Wed, 29 Aug 2007)
New Revision: 3952

Modified:
   packages/trunk/a7xpg/debian/changelog
   packages/trunk/a7xpg/debian/patches/makefile.patch
   packages/trunk/a7xpg/debian/rules
Log:
Makefile compiles now



Modified: packages/trunk/a7xpg/debian/changelog
===================================================================
--- packages/trunk/a7xpg/debian/changelog	2007-08-29 17:17:04 UTC (rev 3951)
+++ packages/trunk/a7xpg/debian/changelog	2007-08-29 17:34:59 UTC (rev 3952)
@@ -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>  Wed, 29 Aug 2007 16:35:01 +0000
 

Modified: packages/trunk/a7xpg/debian/patches/makefile.patch
===================================================================
--- packages/trunk/a7xpg/debian/patches/makefile.patch	2007-08-29 17:17:04 UTC (rev 3951)
+++ packages/trunk/a7xpg/debian/patches/makefile.patch	2007-08-29 17:34:59 UTC (rev 3952)
@@ -1,36 +1,42 @@
+# 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
-+++ a7xpg-0.11.dfsg1/Makefile	2007-08-29 16:32:45.000000000 +0000
-@@ -0,0 +1,34 @@
-+DSRC=$(shell find src -name "*.d")
-+SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d
++++ 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 -lpthread -lGLU -lGL -lm -lstdc++ `sdl-config --libs` -lSDL_mixer
++LIBS=-lgphobos -lGLU -lGL `sdl-config --libs` -lSDL_mixer -lpthread -lm -lstdc++ 
 +EXE=a7xpg
 +
 +all: $(EXE)
 +
-+$(EXE): $(OBJS) $(COBJS)
-+	$(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
++$(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 -I/usr/X11R6/include/ $<
++	$(DC) -d -c -of$@ $(DFLAGS) -Iimport -Isrc $<
 +
 +$(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

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