[SCM] Rasmol packaging branch, master, updated. debian/2.7.4.2-3-12-g46066a4

[Teemu Ikonen]

The following commit has been merged in the master branch:
commit 218450a8e2aeddc26b059f879e5278148e9b40ca
Author: Teemu Ikonen <tpikonen at gmail.com>
Date:   Mon Sep 8 15:42:54 2008 +0200

    rules: build system changes
    
    Allow building GTK and X11 versions separately for testing.

diff --git a/debian/rules b/debian/rules
index 216985e..8fa96cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,21 +25,34 @@ configure-stamp:
 #Architecture
 build: build-arch build-indep
 
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-        # Add here commands to compile the arch part of the package.
+gtk-clean-stamp:
 	dh_testdir
+	-rm -f x11-clean-stamp
+	cd $(CURDIR)/src ; xmkmf -DGTKWIN ; cd $(CURDIR)
+	$(MAKE) -C $(SRC) clean;
+	touch gtk-clean-stamp
 
-	zcat $(DOC)/manualA4.pdf.gz > manualA4.pdf
-	zcat $(DOC)/refcardA4.pdf.gz > refcardA4.pdf
+x11-clean-stamp:
+	dh_testdir
+	-rm -f gtk-clean-stamp
+	cd $(CURDIR)/src ; xmkmf -DX11WIN ; cd $(CURDIR)
+	$(MAKE) -C $(SRC) clean;
+	touch x11-clean-stamp
 
-	cd $(CURDIR)/src ; xmkmf -DGTKWIN ; cd $(CURDIR)
+build-gtk: configure-stamp gtk-clean-stamp
+	dh_testdir
 	$(MAKE) -C $(SRC) gtkui.h
 	$(MAKE) -C $(SRC) DEPTHDEF=-DTHIRTYTWOBIT=1 rasmol
 	mv $(SRC)/rasmol $(SRC)/rasmol-gtk
-	$(MAKE) -C $(SRC) clean;
 
-	cd $(CURDIR)/src ; xmkmf -DX11WIN ; cd $(CURDIR)
+
+build-x11-test: configure-stamp x11-clean-stamp
+	dh_testdir
+	$(MAKE) -C $(SRC) DEPTHDEF=-DTHIRTYTWOBIT=1 rasmol
+	mv $(SRC)/rasmol $(SRC)/rasmol.32
+
+build-x11: configure-stamp x11-clean-stamp
+	dh_testdir
 	$(MAKE) -C $(SRC) DEPTHDEF=-DEIGHTBIT=1 rasmol
 	mv $(SRC)/rasmol $(SRC)/rasmol.8
 	$(MAKE) -C $(SRC) clean;
@@ -50,7 +63,13 @@ build-arch-stamp: configure-stamp
 	
 	$(MAKE) -C $(SRC) DEPTHDEF=-DTHIRTYTWOBIT=1 rasmol
 	mv $(SRC)/rasmol $(SRC)/rasmol.32
-	
+
+build-arch: build-arch-stamp
+build-arch-stamp: build-gtk build-x11
+	dh_testdir
+
+	zcat $(DOC)/manualA4.pdf.gz > manualA4.pdf
+	zcat $(DOC)/refcardA4.pdf.gz > refcardA4.pdf
 	touch build-arch-stamp
 
 build-indep: build-indep-stamp
@@ -61,7 +80,8 @@ build-indep-stamp: configure-stamp
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp configure-stamp
+	rm -f build-arch-stamp build-indep-stamp configure-stamp \
+		gtk-clean-stamp x11-clean-stamp
 
 	# Add here commands to clean up after the build process.
 	if [ -f src/Makefile ] ; then $(MAKE) -C $(SRC) distclean ; fi

-- 
Rasmol packaging