diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2006-07-11 22:41:51 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2006-07-11 22:41:51 +0000 |
| commit | 8c747c78299c1b4285f22657afc8fa888dece819 (patch) | |
| tree | a755fbedede09121ae675ce754ec51c2540a16c5 | |
| parent | d819586f5274fbee9c04f2c837c9fb6c5b034c74 (diff) | |
| download | xine-lib-8c747c78299c1b4285f22657afc8fa888dece819.tar.gz xine-lib-8c747c78299c1b4285f22657afc8fa888dece819.tar.bz2 | |
Complete the auto*-running prevention option.
Make the "noopt" option also --disable-optimizations.
Assume that the next upload will be of 1.1.2.
CVS patchset: 8120
CVS date: 2006/07/11 22:41:51
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rwxr-xr-x | debian/rules | 18 |
2 files changed, 20 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 1cb35e7f6..22a88c335 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ -xine-lib (1.1.1+cvs20060702-2) UNRELEASED; urgency=low +xine-lib (1.1.2-1) UNRELEASED; urgency=low + * New upstream release. + + [Reinhard Tartler] * updated README.Debian [Darren Salt] - * Option to prevent autogen.sh from being run on package build. - Use DEB_BUILD_OPTIONS='noauto'. + * Option to prevent autogen.sh from being run on package build and the + generated files from being removed on cleanup. + Use DEB_BUILD_OPTIONS='noauto' at build time to invoke this behaviour. + * Make DEB_BUILD_OPTIONS='noopt' also use --disable-optimizations. -- Reinhard Tartler <siretart@tauware.de> Mon, 3 Jul 2006 11:13:30 +0200 diff --git a/debian/rules b/debian/rules index 889a909db..d2c274119 100755 --- a/debian/rules +++ b/debian/rules @@ -20,9 +20,12 @@ major=`ls src/xine-engine/.libs/libxine*.so.* | \ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_CONFIG_OPTIONS := + CFLAGS += -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 + DEB_BUILD_CONFIG_OPTIONS += --disable-optimizations endif INSTALL_TARGET := install BUILD_TARGET := all @@ -52,23 +55,26 @@ ifeq (,$(findstring optimize,$(DEB_BUILD_OPTIONS))) $(warning ignoring DEB_HOST_GNU_TYPE = $(DEB_HOST_GNU_TYPE)) DEB_HOST_GNU_TYPE := $(DEB_BUILD_GNU_TYPE) endif - DEB_BUILD_GNU_OPTION := --build=$(DEB_BUILD_GNU_TYPE) + DEB_BUILD_CONFIG_OPTIONS += --build=$(DEB_BUILD_GNU_TYPE) endif +# --mandir - remove after etch released (autoconf >= 2.59c gets it right) CONFIGURE_FLAGS := --prefix=/usr \ --mandir=\$${prefix}/share/man \ --with-external-libmad \ - $(DEB_BUILD_GNU_OPTION) \ + $(DEB_BUILD_CONFIG_OPTIONS) \ CFLAGS="$(CFLAGS)" -configure: configure-stamp $(AUTOGEN) +configure: configure-stamp configure-stamp: dh_testdir -ifeq (,$(findstring noauto,$(DEB_BUILD_OPTIONS)) +ifeq (,$(findstring noauto,$(DEB_BUILD_OPTIONS))) # let's run autohell on the buildds! + -rm -f .noauto chmod +x ./autogen.sh ./autogen.sh $(CONFIGURE_FLAGS) else + touch .noauto ./configure $(CONFIGURE_FLAGS) endif touch configure-stamp @@ -91,8 +97,8 @@ clean: rm -f build-stamp configure-stamp po/*.gmo po/stamp-po -$(MAKE) distclean # remove more cruft leftover by autohell - -find . -name Makefile.in -print | xargs rm - rm -rf compile config.guess configure depcomp install-sh ltmain.sh missing + -test -f .noauto || find . -name Makefile.in -print | xargs rm + test -f .noauto || rm -rf compile config.guess configure depcomp install-sh ltmain.sh missing dh_clean install: build |