[SCM] ardour Debian packaging branch, master, updated. upstream/2.7.1-64-ged4eb65

[fsateler-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ed4eb6538dedad77c6d92c5a34b846b696d63107
Author: Felipe Sateler <fsateler at gmail.com>
Date:   Tue Mar 31 23:58:59 2009 +1100

    Build and install in separate stages.
    
    Do "out of tree" builds by cp -al the sources into a new directory.
    This way it is possible to build each flavor in the build target, and
    then install each of them in the install stage.

diff --git a/debian/ardour-altivec.examples b/debian/ardour-altivec.examples
index 9e8267d..8b7d5a7 100644
--- a/debian/ardour-altivec.examples
+++ b/debian/ardour-altivec.examples
@@ -1 +1 @@
-ardour_system.rc
+build-altivec/ardour_system.rc
diff --git a/debian/ardour-i686.examples b/debian/ardour-i686.examples
index 9e8267d..76c4214 100644
--- a/debian/ardour-i686.examples
+++ b/debian/ardour-i686.examples
@@ -1 +1 @@
-ardour_system.rc
+build-i686/ardour_system.rc
diff --git a/debian/ardour.examples b/debian/ardour.examples
index 3f6d669..8f5377b 100644
--- a/debian/ardour.examples
+++ b/debian/ardour.examples
@@ -1,2 +1,2 @@
-ardour_system.rc
+build-generic/ardour_system.rc
 
diff --git a/debian/rules b/debian/rules
index b20eafa..c25b47c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,34 +80,58 @@ DEB_DH_STRIP_ARGS := --dbg-package=ardour
 DEB_SCONS_ENVVARS :=
 DEB_SCONS_INVOKE = $(DEB_SCONS_ENVVARS) scons 
 
-#common-build-arch:: debian/stamp-scons-build
+# For an out-of-tree build, we just cp -al all the needed files.
+# It seems these are enough
+BUILD_FILES = ardour.rc.in gtk2_ardour icons libs SConstruct templates tools vst
+
+common-build-arch:: debian/stamp-scons-build
 debian/stamp-scons-build:
-	-mkdir -p $(DEB_DESTDIR)/generic
-	$(DEB_SCONS_INVOKE) 'ARCH=$(CFLAGS)' DESTDIR=$(DEB_DESTDIR)/generic \
-		$(DEB_SCONS_EXTRA_FLAGS) $(DEB_SCONS_NOOPT_FLAGS) 
-	$(DEB_SCONS_INVOKE) 'ARCH=$(CFLAGS)' DESTDIR=$(DEB_DESTDIR)/generic \
-		$(DEB_SCONS_EXTRA_FLAGS) $(DEB_SCONS_NOOPT_FLAGS) \
-		install
+	mkdir -p $(DEB_DESTDIR)/generic
+	mkdir -p build-generic
+	cp -alf $(BUILD_FILES) build-generic
+	cd build-generic && $(DEB_SCONS_INVOKE) 'ARCH=$(CFLAGS)' \
+		DESTDIR=$(DEB_DESTDIR)/generic \
+		$(DEB_SCONS_EXTRA_FLAGS) $(DEB_SCONS_NOOPT_FLAGS)
 ifneq (,$(findstring i386,$(DEB_BUILD_ARCH)))
-	-mkdir -p $(DEB_DESTDIR)/i686
-	$(DEB_SCONS_INVOKE) --clean
-	$(DEB_SCONS_INVOKE) 'ARCH=$(I686_OPT_FLAGS)' DESTDIR=$(DEB_DESTDIR)/i686 \
+	mkdir -p $(DEB_DESTDIR)/i686
+	mkdir -p build-i686
+	cp -alf $(BUILD_FILES) build-i686
+	cd build-i686 && $(DEB_SCONS_INVOKE) 'ARCH=$(I686_OPT_FLAGS)' \
+		DESTDIR=$(DEB_DESTDIR)/i686 \
 		DEBUG=no $(DEB_SCONS_EXTRA_FLAGS) \
 		FPU_OPTIMIZATION=yes DIST_TARGET=i686
-	$(DEB_SCONS_INVOKE) 'ARCH=$(I686_OPT_FLAGS)' DESTDIR=$(DEB_DESTDIR)/i686 \
+endif
+ifneq (,$(findstring powerpc,$(DEB_BUILD_ARCH)))
+	mkdir -p $(DEB_DESTDIR)/altivec
+	mkdir -p build-altivec
+	cp -alf $(BUILD_FILES) build-altivec
+	cd build-altivec && $(DEB_SCONS_INVOKE) 'ARCH=$(ALTIVEC_OPT_FLAGS)' \
+		DESTDIR=$(DEB_DESTDIR)/altivec \
+		DEBUG=no $(DEB_SCONS_EXTRA_FLAGS)
+endif
+	touch $@
+
+install/ardour::
+	cd build-generic && $(DEB_SCONS_INVOKE) 'ARCH=$(CFLAGS)' \
+		DESTDIR=$(DEB_DESTDIR)/generic \
+		$(DEB_SCONS_EXTRA_FLAGS) $(DEB_SCONS_NOOPT_FLAGS) \
+		install
+
+ifneq (,$(findstring i386,$(DEB_BUILD_ARCH)))
+install/ardour-i686::
+	cd build-i686 && $(DEB_SCONS_INVOKE) 'ARCH=$(I686_OPT_FLAGS)' \
+		DESTDIR=$(DEB_DESTDIR)/i686 \
 		DEBUG=no $(DEB_SCONS_EXTRA_FLAGS) \
 		FPU_OPTIMIZATION=yes DIST_TARGET=i686 \
 		install
 endif
+
 ifneq (,$(findstring powerpc,$(DEB_BUILD_ARCH)))
-	-mkdir -p $(DEB_DESTDIR)/altivec
-	$(DEB_SCONS_INVOKE) --clean
-	$(DEB_SCONS_INVOKE) 'ARCH=$(ALTIVEC_OPT_FLAGS)' DESTDIR=$(DEB_DESTDIR)/altivec \
-		DEBUG=no $(DEB_SCONS_EXTRA_FLAGS)
-	$(DEB_SCONS_INVOKE) 'ARCH=$(ALTIVEC_OPT_FLAGS)' DESTDIR=$(DEB_DESTDIR)/altivec \
+install/ardour-altivec::
+	cd build-altivec && $(DEB_SCONS_INVOKE) 'ARCH=$(ALTIVEC_OPT_FLAGS)' \
+		DESTDIR=$(DEB_DESTDIR)/altivec \
 		DEBUG=no $(DEB_SCONS_EXTRA_FLAGS) install
 endif
-	touch debian/stamp-scons-build
 
 # this is bad but the only easy way to have ardour.rc generated from
 # ardour.rc.in
@@ -117,11 +141,8 @@ common-install-arch:: debian/stamp-scons-build
 clean:: scons-clean
 scons-clean::
 	$(MAKE) -f debian/rules reverse-config
-	-mkdir -p $(DEB_DESTDIR)
-	-$(DEB_SCONS_INVOKE) --clean
-	-rm -rf $(DEB_DESTDIR) debian/stamp-scons-build
-	-rm -rf config.log scache.conf .sconf_temp .sconsign.dblite
-	-rm -rf libs/gtkmm2ext/*.mo gtk2_ardour/po/*.mo libs/ardour/*.mo
+	rm -rf build-generic build-i686 build-altivec
+	rm -rf $(DEB_DESTDIR) debian/stamp-scons-build
 
 	rm -rf debian/ardour-dbg
 	rm -f gtk2_ardour/*.mo

-- 
ardour Debian packaging