[SCM] Rasmol packaging branch, master, updated. debian/2.7.4.2-5-71-g25ff4b1

[Teemu Ikonen]

The following commit has been merged in the master branch:
commit cef05dbbd87ce783085d99038e6cbd87e57a067c
Author: Teemu Ikonen <tpikonen at gmail.com>
Date:   Wed May 22 23:19:31 2013 +0200

    rules: Run xmkmf only twice per build.

diff --git a/debian/rules b/debian/rules
index 95aae0d..bbe63f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ include /usr/share/dpkg/buildflags.mk
 build-gtk: src/rasmol-gtk
 src/rasmol-gtk:
 	dh_testdir
+	-rm -f x11-stamp
 	cd $(CURDIR)/src ; xmkmf -DGTKWIN ; cd $(CURDIR)
 	$(MAKE) -C src clean;
 	$(MAKE) -C src
@@ -14,23 +15,24 @@ src/rasmol-gtk:
 
 build-x11: src/rasmol.8 src/rasmol.16 src/rasmol.32
 
-src/rasmol.8:
-	dh_testdir
+x11-stamp:
 	cd $(CURDIR)/src ; xmkmf -DX11WIN ; cd $(CURDIR)
+	touch $@
+
+src/rasmol.8: x11-stamp
+	dh_testdir
 	$(MAKE) -C src clean;
 	$(MAKE) -C src DEPTHDEF=-DEIGHTBIT=1 rasmol
 	mv src/rasmol src/rasmol.8
 
-src/rasmol.16:
+src/rasmol.16: x11-stamp
 	dh_testdir
-	cd $(CURDIR)/src ; xmkmf -DX11WIN ; cd $(CURDIR)
 	$(MAKE) -C src clean;
 	$(MAKE) -C src DEPTHDEF=-DSIXTEENBIT=1 rasmol
 	mv src/rasmol src/rasmol.16
 
-src/rasmol.32:
+src/rasmol.32: x11-stamp
 	dh_testdir
-	cd $(CURDIR)/src ; xmkmf -DX11WIN ; cd $(CURDIR)
 	$(MAKE) -C src clean;
 	$(MAKE) -C src DEPTHDEF=-DTHIRTYTWOBIT=1 rasmol
 	mv src/rasmol src/rasmol.32
@@ -51,6 +53,7 @@ clean:
 	-rm -f src/rasmol-gtk src/rasmol.32 src/rasmol.16 src/rasmol.8
 	-rm -f src/gtkui.h
 	-rm -f manualA4.pdf refcardA4.pdf
+	-rm -f x11-stamp
 	dh clean
 
 

-- 
Rasmol packaging