[Pkg-voip-commits] r3624 - pwlib/trunk/debian

[kilian at alioth.debian.org]

Author: kilian
Date: 2007-05-28 14:33:12 +0000 (Mon, 28 May 2007)
New Revision: 3624

Modified:
   pwlib/trunk/debian/control
   pwlib/trunk/debian/rules
Log:
fix installation and put all static libs into libpt-dev with proper naming
(documented in debian/control).
--This line, and those below, will be ignored--

M    trunk/debian/control
M    trunk/debian/rules


Modified: pwlib/trunk/debian/control
===================================================================
--- pwlib/trunk/debian/control	2007-05-27 22:32:38 UTC (rev 3623)
+++ pwlib/trunk/debian/control	2007-05-28 14:33:12 UTC (rev 3624)
@@ -76,6 +76,11 @@
  many years ago as a method to produce applications to run on both
  Microsoft Windows and Unix X-Window systems.
  .
+ The static library comes in all three flavours:
+ libpt_s.a   - notrace opt version
+ libpt_r_s.a - ptrace-enabled opt version
+ libpt_d_s.a - ptrace-enabled debug version
+ .
  For more information on PWLib visit the development homepage
  http://www.voxgratia.org/
 

Modified: pwlib/trunk/debian/rules
===================================================================
--- pwlib/trunk/debian/rules	2007-05-27 22:32:38 UTC (rev 3623)
+++ pwlib/trunk/debian/rules	2007-05-28 14:33:12 UTC (rev 3624)
@@ -120,7 +120,7 @@
 	$(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" -C samples/hello_world/ DEBUG= P_SHAREDLIB=0 OBJDIR_SUFFIX=r PW_LIBDIR=$(CURDIR)/lib/opt optnoshared
 	$(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" -C samples/hello_world/ DEBUG=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=d PW_LIBDIR=$(CURDIR)/lib/debug debugnoshared
 	
-	samples/hello_world/obj_*_/hello
+	samples/hello_world/obj_*_n/hello
 	samples/hello_world/obj_*_d/hello
 	samples/hello_world/obj_*_r/hello
 	
@@ -142,12 +142,12 @@
 		echo opt hello_world sample correctly compiled non-static; \
 	fi
 	LD_LIBRARY_PATH=$(CURDIR)/lib/opt samples/hello_world/obj_*_r/hello
-	if (samples/hello_world/obj_*_/hello 2>/dev/null);then \
+	if (samples/hello_world/obj_*_n/hello 2>/dev/null);then \
 		echo opt hello_world sample incorrectly compiled static; false ; \
 	else \
 		echo opt hello_world sample correctly compiled non-static; \
 	fi
-	LD_LIBRARY_PATH=$(CURDIR)/lib/notrace samples/hello_world/obj_*_/hello
+	LD_LIBRARY_PATH=$(CURDIR)/lib/notrace samples/hello_world/obj_*_n/hello
 	# if this won't work, we needn't even try going any further...
 	# cleanup to make sure we don't install any of the samples we just compiled
 	$(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
@@ -246,8 +246,8 @@
 	    -e 's#$$(PWLIBDIR)/lib#/usr/lib#g' debian/libpt-dev/usr/share/pwlib/make/unix.mak
 	# copy static opt version to libpt-dev
 	install -m 755 lib/notrace/libpt_s.a debian/libpt-dev/usr/lib
-	install -m 755 lib/opt/libpt_s.a debian/libpt-dev/usr/lib/pwlib-ptrace
-	install -m 755 lib/debug/libpt_s.a debian/libpt-dev/usr/lib/pwlib-develop
+	install -m 755 lib/opt/libpt_s.a debian/libpt-dev/usr/lib/libpt_r_s.a
+	install -m 755 lib/debug/libpt_s.a debian/libpt-dev/usr/lib/libpt_d_s.a
 	find debian/libpt-dev/usr/include -type f -exec chmod 644 {} \;
 	# ptlib-config in libpt-dev
 	# changing build/machine dependent data in ptlib-config