r3425 - packages/trunk/transcend/debian

[Miriam Ruiz]

Author: baby-guest
Date: 2007-07-16 17:50:52 +0000 (Mon, 16 Jul 2007)
New Revision: 3425

Modified:
   packages/trunk/transcend/debian/changelog
   packages/trunk/transcend/debian/rules
Log:
Fixed building system to respect DEB_BUILD_OPTIONS={noopt, nostrip} and use CFLAGS defined in debian/rules



Modified: packages/trunk/transcend/debian/changelog
===================================================================
--- packages/trunk/transcend/debian/changelog	2007-07-16 17:20:47 UTC (rev 3424)
+++ packages/trunk/transcend/debian/changelog	2007-07-16 17:50:52 UTC (rev 3425)
@@ -3,8 +3,12 @@
   [ Gonéri Le Bouder ]
   * fix the watch file
 
- -- Miriam Ruiz <little_miry at yahoo.es>  Wed, 11 Jul 2007 22:23:37 +0200
+  [ Miriam Ruiz ]
+  * Fixed building system to respect DEB_BUILD_OPTIONS={noopt, nostrip} and use
+    CFLAGS defined in debian/rules. Closes: #433361
 
+ -- Miriam Ruiz <little_miry at yahoo.es>  Mon, 16 Jul 2007 17:47:01 +0000
+
 transcend (0.3.dfsg1-1) unstable; urgency=low
 
   * Removed non-free stuff.

Modified: packages/trunk/transcend/debian/rules
===================================================================
--- packages/trunk/transcend/debian/rules	2007-07-16 17:20:47 UTC (rev 3424)
+++ packages/trunk/transcend/debian/rules	2007-07-16 17:50:52 UTC (rev 3425)
@@ -3,49 +3,38 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+CFLAGS_DEBUG = -g
 
-CFLAGS = -Wall -g
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+	CFLAGS_OPTIMIZE = -O0
 else
-	CFLAGS += -O2
+	CFLAGS_OPTIMIZE = -O2
 endif
 
-config.status:
+config: config-stamp
+config-stamp:
 	dh_testdir
-
 	$(MAKE) -f /usr/share/quilt/quilt.make patch
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub Transcend/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess Transcend/config.guess
-endif
-
 	chmod u+x Transcend/configure
-	cd Transcend; CFLAGS="$(CFLAGS) -Wl,-z,defs" platformSelection=1 ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	cd Transcend; CFLAGS="$(CFLAGS) -Wl,-z,defs" platformSelection=1 ./configure
+	touch $@
 
 build: build-stamp
-
-build-stamp:  config.status
+build-stamp: config-stamp
 	dh_testdir
-	# Add here commands to compile the package.
-	cd Transcend/game;$(MAKE)
-	touch build-stamp
+	cd Transcend/game; $(MAKE) OPTIMIZE_FLAG="$(CFLAGS_OPTIMIZE)" DEBUG_FLAG="$(CFLAGS_DEBUG)"
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
-	-cd Transcend/game; $(MAKE) clean; rm -f config.sub config.guess config.log
+	rm -f {config,build}-stamp 
+	-cd Transcend/game; $(MAKE) clean; rm -f config.{sub,guess,log}
 	-rm -f Transcend/editors/Makefile
 	-rm -f Transcend/game/Makefile
 	-rm -f Transcend/game/Makefile.minorGems_dependencies
@@ -53,7 +42,7 @@
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
 
-install: build
+install: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
@@ -64,7 +53,6 @@
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
 
 # Build architecture-dependent files here.
 binary-arch: build install