r3955 - packages/trunk/a7xpg/debian

[Miriam Ruiz]

Author: baby-guest
Date: 2007-08-29 17:45:02 +0000 (Wed, 29 Aug 2007)
New Revision: 3955

Modified:
   packages/trunk/a7xpg/debian/changelog
   packages/trunk/a7xpg/debian/control
   packages/trunk/a7xpg/debian/rules
Log:
Use make instead of ant



Modified: packages/trunk/a7xpg/debian/changelog
===================================================================
--- packages/trunk/a7xpg/debian/changelog	2007-08-29 17:43:14 UTC (rev 3954)
+++ packages/trunk/a7xpg/debian/changelog	2007-08-29 17:45:02 UTC (rev 3955)
@@ -5,6 +5,7 @@
   * Added XS-Vcs-Svn and XS-Vcs-Browser to control.
   * Added patch to create Makefile
   * Added verbose switch (-v) to ant.
+  * Use make instead of ant. Removed build dependency on ant.
 
  -- Miriam Ruiz <little_miry at yahoo.es>  Wed, 29 Aug 2007 16:35:01 +0000
 

Modified: packages/trunk/a7xpg/debian/control
===================================================================
--- packages/trunk/a7xpg/debian/control	2007-08-29 17:43:14 UTC (rev 3954)
+++ packages/trunk/a7xpg/debian/control	2007-08-29 17:45:02 UTC (rev 3955)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org> 
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Peter De Wachter <pdewacht at gmail.com>
-Build-Depends: debhelper (>= 5), ant, quilt, gdc,
+Build-Depends: debhelper (>= 5), quilt, gdc,
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
  libsdl1.2-dev, libsdl-mixer1.2-dev
 Standards-Version: 3.7.2

Modified: packages/trunk/a7xpg/debian/rules
===================================================================
--- packages/trunk/a7xpg/debian/rules	2007-08-29 17:43:14 UTC (rev 3954)
+++ packages/trunk/a7xpg/debian/rules	2007-08-29 17:45:02 UTC (rev 3955)
@@ -7,8 +7,10 @@
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
+	DFLAGS = -g -debug
 else
 	CFLAGS += -O2
+	DFLAGS = -O -release
 endif
 
 configure: configure-stamp
@@ -20,7 +22,8 @@
 build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
-	ant -v
+	#ant -v
+	$(MAKE) CFLAGS="$(CFLAGS)" DFLAGS="$(DFLAGS)"
 	#docbook-to-man debian/a7xpg.sgml > a7xpg.1
 	touch $@
 
@@ -28,7 +31,8 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	ant -v clean
+	#ant -v clean
+	[ ! -f Makefile ] || $(MAKE) clean
 	rm -f a7xpg
 	rm -f `find . -name "*.o"`
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch