[Pkg-voip-commits] r9015 - in /opal/trunk/debian: clean rules

[kilian at alioth.debian.org]

Author: kilian
Date: Thu Jun 23 12:00:25 2011
New Revision: 9015

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9015
Log:
make samples actually compilable

Modified:
    opal/trunk/debian/clean
    opal/trunk/debian/rules

Modified: opal/trunk/debian/clean
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/clean?rev=9015&op=diff
==============================================================================
--- opal/trunk/debian/clean (original)
+++ opal/trunk/debian/clean Thu Jun 23 12:00:25 2011
@@ -1,5 +1,7 @@
 a.out
 Makefile
+config.log
+doxygen.out
 include/opal/buildopts.h
 opal.pc
 opal.spec

Modified: opal/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/rules?rev=9015&op=diff
==============================================================================
--- opal/trunk/debian/rules (original)
+++ opal/trunk/debian/rules Thu Jun 23 12:00:25 2011
@@ -8,6 +8,10 @@
 UPFILENAME := opal_$(UPVERSION).orig.tar.gz
 URL := http://transact.dl.sourceforge.net/sourceforge/opalvoip/opal-$(UPVERSION).tar.bz2
 
+# hack to get samples/simple compiled with new build system
+# no := here for we need evaluation at runtime!
+OPAL_LIBDIR=$(shell sed -n -e "/^OPAL_LIBDIR/s,^.*/,$(CURDIR)/,p" opal_defs.mak)
+
 %:
 	dh $@ --parallel --with autotools_dev
 
@@ -16,14 +20,11 @@
 	if [ -d plugins/audio/iLBC ];then \
 	   echo "DFSG ERROR: iLBC code must be removed from upstream sources" ; false ; \
 	fi
-	dh_auto_configure -- --enable-spandsp
+	dh_auto_configure -- --enable-samples --enable-spandsp
 
 override_dh_auto_build:
-	#dh_auto_build -- opt docs
-	rm -f lib;ln -s lib* lib
-	sed -e 's#^Libs: #Libs: -L$(CURDIR)/lib #' opal.pc >samples/simple/opal.pc
-	$(MAKE) PTLIBDIR=/usr OPALDIR=$(CURDIR) PKG_CONFIG_PATH=$(CURDIR)/samples/simple -C samples/simple
-	rm -f samples/simple/opal.pc
+	sed -e 's#^Libs: #Libs: -L$(OPAL_LIBDIR) #' opal.pc >samples/opal.pc
+	dh_auto_build -- PKG_CONFIG_PATH=$(CURDIR)/samples opt docs
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog*.txt
@@ -34,13 +35,14 @@
 	else \
 		echo shared simpleopal correctly compiled non-static; \
 	fi
-	# reusing lib symlink from building simple
-	LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj*/simpleopal --help >/dev/null
+	LD_LIBRARY_PATH=$(OPAL_LIBDIR) samples/simple/obj*/simpleopal --help >/dev/null
 	rm lib
 
 override_dh_clean:
+	dh_clean -- PKG_CONFIG_PATH=$(CURDIR)/samples
 	rm -rf html
-	dh_clean
+	rm -f samples/opal.pc
+	rm -rf samples/simple/obj_*
 
 override_dh_strip:
 	dh_strip -a --dbg-package=libopal-dbg