[Pkg-voip-commits] r2950 - openh323/trunk/debian

[Kilian Krause]

Author: kilian
Date: 2007-01-05 00:22:39 +0100 (Fri, 05 Jan 2007)
New Revision: 2950

Modified:
   openh323/trunk/debian/changelog
   openh323/trunk/debian/rules
Log:
also build opt and debug version.


Modified: openh323/trunk/debian/changelog
===================================================================
--- openh323/trunk/debian/changelog	2007-01-04 23:22:30 UTC (rev 2949)
+++ openh323/trunk/debian/changelog	2007-01-04 23:22:39 UTC (rev 2950)
@@ -3,8 +3,9 @@
   * NOT RELEASED YET
   * ixjuser.h.dpatch, ixjlid.h.dpatch: Fix compilation without compiler.h
     header on Ubuntu.
+  * Build opt and debug versions of library. (Closes: #345512)
 
- -- Kilian Krause <kilian at debian.org>  Tue, 26 Dec 2006 13:03:33 +0100
+ -- Kilian Krause <kilian at debian.org>  Fri,  5 Jan 2007 00:21:08 +0100
 
 openh323 (1.18.0.dfsg-1) unstable; urgency=high
 

Modified: openh323/trunk/debian/rules
===================================================================
--- openh323/trunk/debian/rules	2007-01-04 23:22:30 UTC (rev 2949)
+++ openh323/trunk/debian/rules	2007-01-04 23:22:39 UTC (rev 2950)
@@ -8,9 +8,11 @@
 #PACKAGE=libopenh323-$(LIBH323COMPAT)
 PACKAGE=libopenh323-1.18.0
 
+ifneq (,$(shell test -f version.h&&grep MAJOR_VERSION version.h))
 VER_MAJOR := $(shell awk '/MAJOR_VERSION/ { print $$3 }' version.h 2>/dev/null)
 VER_MINOR := $(shell awk '/MINOR_VERSION/ { print $$3 }' version.h 2>/dev/null)
 VER_SUB   := $(shell awk '/BUILD_NUMBER/  { print $$3 }' version.h 2>/dev/null)
+endif
 
 SHLIBSVER := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
 
@@ -54,20 +56,37 @@
 	touch autotools
 
 build-arch-stamp: config.status
-	$(MAKE) opt optnoshared 
-	
-	# This dirty stuff is done to compile simple with apropiate options
-	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean opt
-
-	# Check that there is not any blatant error
-	LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj_*_r/simph323 --help >/dev/null
+	$(MAKE) $(MAKE_BUILD_PARAM) bothnoshared bothshared
+	# ensure we do a fresh check with hello world.
+	# ...first static
+	-$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
+	-$(RM) -rf samples/simple/obj_*
+	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple bothnoshared
+	samples/simple/obj_*_d/simph323 --help >/dev/null
+	samples/simple/obj_*_r/simph323 --help >/dev/null
+	# then shared...
+	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
+	$(RM) -rf samples/simple/obj_*
+	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple bothshared
+	if (samples/simple/obj_*_d/simph323 --help >/dev/null);then \
+		echo shared debug simph323 incorrectly compiled static; false;\
+	else \
+		echo shared debug simph323 correctly compiled non-static; \
+	fi
+	LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj_*_d/simpleopal --help >/dev/null
+	if (samples/simple/obj_*_r/simph323 --help >/dev/null);then \
+		echo shared opt simph323 incorrectly compiled static; false;\
+	else \
+		echo shared opt simph323 correctly compiled non-static; \
+	fi
+	LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj_*_r/simpleopal --help >/dev/null
 	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean 
-	
+	-$(RM) -rf samples/simple/obj_*
 	touch build-arch-stamp
 
 build-indep: build-indep-stamp
 build-indep-stamp:
-	$(MAKE) docs
+	$(MAKE) $(MAKE_BUILD_PARAM) docs
 	touch build-indep-stamp
 
 clean: clean-patched unpatch
@@ -77,9 +96,9 @@
 	-rm -f build-arch-stamp build-indep-stamp patch-stamp
 	-rm -f config.status config.log autotools
 	if [ -f Makefile ];then \
-	$(MAKE) $(MAKE_BUILD_PARAM) optclean clean ;\
-	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean;\
+		$(MAKE) $(MAKE_BUILD_PARAM) optclean clean ;\
 	fi
+	-$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean;\
 	-rm -rf samples/simple/obj*
 	-rm -f Makefile openh323u.mak include/openh323buildopts.h
 	-rm -rf lib
@@ -91,7 +110,6 @@
 	-rm -f debian/*substvars
 	-rm -f debian/*.debhelper
 	-rm -f debian/libopenh323-*.*.docs
-
 	-rm -f config.sub config.guess plugins/config.sub plugins/config.guess
 	dh_clean
 
@@ -108,7 +126,7 @@
 	dh_clean -k -a
 	dh_installdirs -a
 
-	$(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/$(PACKAGE)/usr -C src install
+	$(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C src install
 	$(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
 ifneq ($(SHLIBSVER),$(LIBH323COMPAT))
 	ln -s libopenh323.so.$(SHLIBSVER) \
@@ -119,6 +137,11 @@
 	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
 	-rmdir samples/simple/obj*
 
+#	libopenh323-dbg package
+	$(MAKE) $(MAKE_BUILD_PARAM) DEBUG=1 DESTDIR=$(CURDIR)/debian/libopenh323-dbg install
+	$(RM) -rf $(CURDIR)/debian/libopenh323-dbg/usr/include
+	cp lib/libopenh323*.a $(CURDIR)/debian/libopenh323-dbg/usr/lib
+
 #	libopenh323-dev package
 	dh_movefiles -plibopenh323-dev --sourcedir=debian/$(PACKAGE) usr/lib/libopenh323.so
 	rm debian/$(PACKAGE)/usr/lib/libopenh323.so.? \