diff options
| author | Julien Cristau <jcristau@debian.org> | 2008-08-27 19:16:33 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2008-08-27 19:52:14 +0200 |
| commit | fd7cc514d29fef38c325f3bd6f3cae96c298a2e7 (patch) | |
| tree | f2278e4b61df176ec1868702421d6db4e748849f | |
| parent | f6a927b45f019d6c8b5fc8113d19ffc2a889e51e (diff) | |
Some more parallel build updates.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 25 |
2 files changed, 12 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index 17adca10c9e..8108dca327a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mesa (7.1-1) UNRELEASED; urgency=low * Add parallel build support. * New upstream development release + libGLU now only exports its public interface (closes: #319388) + * Some more parallel build updates. -- Julien Cristau <jcristau@debian.org> Mon, 04 Aug 2008 09:36:31 +0200 diff --git a/debian/rules b/debian/rules index 370df33db96..84c0553d749 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,7 @@ CONFIGS = $(SWX11_GLU_CONFIGS) \ STAMP_DIR = debian/stamp STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE) BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS)) -ARCH_INSTALL_STAMPS = $(addprefix $(STAMP)-install-, $(CONFIGS)) +INSTALL_TARGETS = $(addprefix install-, $(CONFIGS)) QUILT_STAMPFN = $(STAMP_DIR)/patch include /usr/share/quilt/quilt.make @@ -153,11 +153,12 @@ configure: $(QUILT_STAMPFN) configure.ac configs: @echo Building the following configurations: $(CONFIGS) -$(STAMP_DIR): +$(STAMP_DIR)/stamp: dh_testdir - mkdir -p $@ + mkdir -p $(STAMP_DIR) + >$@ -$(QUILT_STAMPFN): $(STAMP_DIR) +$(QUILT_STAMPFN): $(STAMP_DIR)/stamp build: $(BUILD_STAMPS) @@ -175,20 +176,16 @@ $(STAMP)-build-%: configure touch $@ -pre-install: +install: + # Add here commands to install the package into debian/tmp dh_testdir dh_testroot dh_clean -k - rm -rf $(ARCH_INSTALL_STAMPS) - -install: $(ARCH_INSTALL_STAMPS) - -$(STAMP)-install-%: $(STAMP)-build-% pre-install - # Add here commands to install the package into debian/tmp dh_installdirs - + $(MAKE) -f debian/rules $(INSTALL_TARGETS) + +install-%: $(STAMP)-build-% cd $(DEB_BUILD_DIR)/$* && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - touch $@ clean: unpatch dh_testdir @@ -225,7 +222,7 @@ binary-indep: install dh_builddeb -i # Build architecture-dependent files here. -binary-arch: build install +binary-arch: install dh_testdir dh_testroot dh_installchangelogs -s |