[Pkg-voip-commits] r3625 - opal/trunk/debian

kilian at alioth.debian.org kilian at alioth.debian.org
Mon May 28 14:35:05 UTC 2007 

Author: kilian
Date: 2007-05-28 14:35:04 +0000 (Mon, 28 May 2007)
New Revision: 3625

Modified:
   opal/trunk/debian/control
   opal/trunk/debian/rules
Log:
small cleanup to have just one naming convention over all three libs (notrace,
not highopt) and also move static libs into libopal-dev with mentioning in
Description.


Modified: opal/trunk/debian/control
===================================================================
--- opal/trunk/debian/control	2007-05-28 14:33:12 UTC (rev 3624)
+++ opal/trunk/debian/control	2007-05-28 14:35:04 UTC (rev 3625)
@@ -5,7 +5,7 @@
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
 Build-Depends: debhelper (>= 4.0.2), libpt-dev (>= 1.10.7~dfsg~), g++ (>= 2.95), dpatch (>= 1.11), doxygen, autotools-dev, libspeex-dev (>= 1.1.11)
 Build-Depends-Indep: doxygen
-Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14), libopenh323-dev, libopal-dev
+Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14), libopal-dev
 Standards-Version: 3.6.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
@@ -82,6 +82,11 @@
  everybody. These protocols are most used for Voice over IP (VoIP)
  conferencing.
  .
+ The static library comes in all three flavours:
+ libopal_s.a   - notrace opt version
+ libopal_r_s.a - ptrace-enabled opt version
+ libopal_d_s.a - ptrace-enabled debug version
+ .
  For more information on the OPAL project visit them at
  http://www.voxgratia.org/
 

Modified: opal/trunk/debian/rules
===================================================================
--- opal/trunk/debian/rules	2007-05-28 14:33:12 UTC (rev 3624)
+++ opal/trunk/debian/rules	2007-05-28 14:35:04 UTC (rev 3625)
@@ -72,8 +72,8 @@
 	touch $@
 
 build-arch-stamp: config.status
-	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/highopt optshared
-	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/highopt optnoshared
+	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/notrace optshared
+	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/notrace optnoshared
 	
 	# put NOTRACE to empty to build with PTRACING code
 	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt optshared
@@ -85,7 +85,7 @@
 	# ...first static
 	-$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
 	$(RM) -rf samples/simple/obj_*
-	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/highopt -C samples/simple optnoshared
+	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/notrace -C samples/simple optnoshared
 	
 	# put NOTRACE to empty to build with PTRACING code
 	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt -C samples/simple optnoshared
@@ -97,7 +97,7 @@
 	## then shared...
 	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
 	$(RM) -rf samples/simple/obj_*
-	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/highopt -C samples/simple optshared
+	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/notrace -C samples/simple optshared
 	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt -C samples/simple optshared
 	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=d OPAL_LIBDIR=$(CURDIR)/lib/debug -C samples/simple debugshared
 	if (samples/simple/obj_*_d/simpleopal --help >/dev/null);then \
@@ -113,11 +113,11 @@
 	fi
 	LD_LIBRARY_PATH=$(CURDIR)/lib/opt samples/simple/obj_*_r/simpleopal --help >/dev/null
 	if (samples/simple/obj_*_n/simpleopal --help >/dev/null);then \
-		echo shared highopt simpleopal incorrectly compiled static; false;\
+		echo shared notrace simpleopal incorrectly compiled static; false;\
 	else \
-		echo shared highopt simpleopal correctly compiled non-static; \
+		echo shared notrace simpleopal correctly compiled non-static; \
 	fi
-	LD_LIBRARY_PATH=$(CURDIR)/lib/highopt samples/simple/obj_*_n/simpleopal --help >/dev/null
+	LD_LIBRARY_PATH=$(CURDIR)/lib/notrace samples/simple/obj_*_n/simpleopal --help >/dev/null
 	#$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean 
 	#$(RM) -rf samples/simple/obj_*
 	
@@ -168,7 +168,7 @@
 	install -d -m 755 $(CURDIR)/debian/$(PACKAGE)/usr/lib \
 	  $(CURDIR)/debian/$(PACKAGE)-ptrace/usr/lib \
 	  $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
-	install -m 755 lib/highopt/libopal.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
+	install -m 755 lib/notrace/libopal.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
 	install -m 755 lib/opt/libopal.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-ptrace/usr/lib
 	install -m 755 lib/debug/libopal.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
 	
@@ -185,25 +185,23 @@
 	done
 endif
 	# simpleopal
-	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/highopt INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
+	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/notrace INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
 #	clean simple to install it as a sample in the docs
 	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
 	$(RM) -rf samples/simple/obj_*
 	
-#	libopal-*-(ptrace|develop)
-	cp -v lib/opt/libopal_s.a debian/$(PACKAGE)-ptrace/usr/lib
-	cp -v lib/debug/libopal_s.a debian/$(PACKAGE)-develop/usr/lib
-
 #	libopal-dev package
-	cp lib/highopt/libopal*.a $(CURDIR)/debian/libopal-dev/usr/lib
+	cp -v lib/notrace/libopal_s.a debian/libopal-dev/usr/lib/
+	cp -v lib/opt/libopal_s.a debian/libopal-dev/usr/lib/libopal_r_s.a
+	cp -v lib/debug/libopal_s.a debian/libopal-dev/usr/lib/libopal_d_s.a
 	ln -s libopal.so.$(SHLIBSVER) debian/libopal-dev/usr/lib/libopal.so
 	ln -s libopal.so.$(SHLIBSVER) debian/libopal-dev/usr/lib/libopal.so.$(VER_MAJOR)
-
+	
 	sed -e 's#^OPALDIR.*#OPALDIR = \/usr\/lib\/opal#g' \
 	    opal_inc.mak > debian/libopal-dev/usr/share/opal/opal_inc.mak
 	cp -vr include/* debian/libopal-dev/usr/include/opal
 	find debian/libopal-dev/usr/include -type f -exec chmod 644 {} \;
-
+	
 	cp version.h debian/libopal-dev/usr/include/opal/
 
 	# linking stuff under usr/share/opal

More information about the Pkg-voip-commits mailing list