r17984 - in /desktop/experimental/pygtk/debian: changelog rules

lool at users.alioth.debian.org lool at users.alioth.debian.org
Thu Dec 25 21:42:15 UTC 2008


Author: lool
Date: Thu Dec 25 21:42:14 2008
New Revision: 17984

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17984
Log:
Rework install rules and dependencies completely to avoid .PHONY implicit
targets.

Modified:
    desktop/experimental/pygtk/debian/changelog
    desktop/experimental/pygtk/debian/rules

Modified: desktop/experimental/pygtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/changelog?rev=17984&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/changelog (original)
+++ desktop/experimental/pygtk/debian/changelog Thu Dec 25 21:42:14 2008
@@ -9,9 +9,9 @@
     config.guess and .sub after unpatching.  This avoids config.guess and
     .subin the diff, and allows control over fully working and fully patched
     trees.
-  * List install-clean $(PYVERS:%=install-%) $(PYVERS:%=dbg-install-%) in
-    .PHONY.
   * Don't strip python-gtk2-dbg.
+  * Rework install rules and dependencies completely to avoid .PHONY implicit
+    targets.
 
  -- Loic Minier <lool at dooz.org>  Fri, 19 Dec 2008 15:15:52 +0100
 

Modified: desktop/experimental/pygtk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/rules?rev=17984&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/rules (original)
+++ desktop/experimental/pygtk/debian/rules Thu Dec 25 21:42:14 2008
@@ -78,12 +78,7 @@
 
 build: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
 
-install-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-install-%: build-%/build-stamp
+build-%/install-stamp: build-%/build-stamp
 	dh_testdir
 	dh_testroot
 	PYTHON=/usr/bin/python$* $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
@@ -100,14 +95,21 @@
 	mkdir debian/tmp/usr/include/python$*
 	mv debian/tmp/usr/include/pygtk-2.0 debian/tmp/usr/include/python$*
 
-dbg-install-%: dbg-build-%/build-stamp
+dbg-build-%/install-stamp: dbg-build-%/build-stamp
 	dh_testdir
 	dh_testroot
 	PYTHON=/usr/bin/python$* $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gtk2-dbg
 	find debian/python-gtk2-dbg ! -type d ! -name '*.so' | xargs rm -f
 	find debian/python-gtk2-dbg -depth -empty -exec rmdir {} \;
+	touch $@
 
-install: build install-clean $(PYVERS:%=install-%) $(PYVERS:%=dbg-install-%)
+install-stamp:
+	dh_testdir
+	dh_testroot
+	# remove the install stamps to force a reinstall (since dh_clean is
+	# removing the package dirs)
+	dh_clean -k $(PYVERS:%=build-%/install-stamp) $(PYVERS:%=dbg-build-%/install-stamp)
+	$(MAKE) -f debian/rules $(PYVERS:%=build-%/install-stamp) $(PYVERS:%=dbg-build-%/install-stamp)
 	# check that all builds with various Python runtimes produced the same
 	# *.defs files (or fail)
 	for v in $(PYVERS); do \
@@ -134,15 +136,17 @@
 	  mv $$i $$(dirname $$i)/$${b}_d.so; \
 	done
 
+install: install-stamp
+
 clean::
 	dh_testdir
 	dh_testroot
+	rm -f install-stamp
 	rm -rf debian/tmp-*
 	rm -rf build-* dbg-build-*
 	$(MAKE) -f debian/rules unpatch
 	dh_clean
 
-# Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
 	dh_testroot
@@ -161,7 +165,6 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
@@ -182,4 +185,4 @@
 	dh_builddeb -s
 
 binary: binary-arch binary-indep
-.PHONY: patch unpatch build install-clean $(PYVERS:%=install-%) $(PYVERS:%=dbg-install-%) clean binary-indep binary-arch binary install
+.PHONY: patch unpatch build install clean binary-indep binary-arch binary




More information about the pkg-gnome-commits mailing list