Author: kibi-guest
Date: 2007-07-30 04:17:19 +0000 (Mon, 30 Jul 2007)
New Revision: 3493
Modified:
packages/trunk/openal/debian/TODO
packages/trunk/openal/debian/changelog
packages/trunk/openal/debian/rules
Log:
Perform an out-of-tree build
Modified: packages/trunk/openal/debian/TODO
===================================================================
--- packages/trunk/openal/debian/TODO 2007-07-30 03:48:59 UTC (rev 3492)
+++ packages/trunk/openal/debian/TODO 2007-07-30 04:17:19 UTC (rev 3493)
@@ -4,10 +4,5 @@
* Adjust the -dev package:
- Probably do not attempt to ship evil .la files, currently commented out in
the install file. Document it in the changelog once it is decided.
- * Adjust the clean target:
- - At the moment, many files are modified at build time, but not restored
- afterwards.
- - Try to make cmake build in a special build directory, which just have to
- be deleted once it is no longer needed.
-- Cyril Brulebois
Modified: packages/trunk/openal/debian/changelog
===================================================================
--- packages/trunk/openal/debian/changelog 2007-07-30 03:48:59 UTC (rev 3492)
+++ packages/trunk/openal/debian/changelog 2007-07-30 04:17:19 UTC (rev 3493)
@@ -27,6 +27,9 @@
`capture', though. Alsa is only enabled on Linux, which sounds fine.
+ Replaced `distclean' by `clean', since cmake doesn't support the
former. Extra cleanup will be needed, see TODO.Debian.
+ + Added a BUILD_TREE variable to specify the build directory where the
+ `out-of-tree' build has to be done. That ensures a nice `clean'
+ target.
* Transition from libopenal0a to libopenal1:
- debian/control:
Renamed package, updated Conflicts/Replaces.
Modified: packages/trunk/openal/debian/rules
===================================================================
--- packages/trunk/openal/debian/rules 2007-07-30 03:48:59 UTC (rev 3492)
+++ packages/trunk/openal/debian/rules 2007-07-30 04:17:19 UTC (rev 3493)
@@ -8,12 +8,16 @@
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+BUILD_TREE=$(CURDIR)/build-tree
+
configure: configure-stamp
configure-stamp:
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
dh_testdir
- cmake . \
+ # Perform an out-of-tree build to keep a clean source tree
+ mkdir $(BUILD_TREE)
+ cd $(BUILD_TREE); cmake .. \
-DCMAKE_INSTALL_PREFIX:STRING="/usr" \
-DBUILD_STATIC:BOOL=ON
@@ -23,7 +27,7 @@
build-stamp:
dh_testdir
- $(MAKE)
+ cd $(BUILD_TREE); $(MAKE)
touch build-stamp
@@ -31,7 +35,7 @@
dh_testdir
dh_testroot
rm -fr build-stamp configure-stamp
- [ ! -f Makefile ] || $(MAKE) clean
+ rm -fr $(BUILD_TREE)
dh_clean
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
@@ -40,7 +44,7 @@
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ cd $(BUILD_TREE); $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# Build architecture-independent files here.
binary-indep: build install