[Pkg-voip-commits] r3626 - openh323/trunk/debian
kilian at alioth.debian.org
kilian at alioth.debian.org
Mon May 28 15:16:24 UTC 2007
Author: kilian
Date: 2007-05-28 15:16:24 +0000 (Mon, 28 May 2007)
New Revision: 3626
Modified:
openh323/trunk/debian/control
openh323/trunk/debian/rules
Log:
also sync naming convention to be "notrace" rather than "highopt". Document static libs in Description.
Modified: openh323/trunk/debian/control
===================================================================
--- openh323/trunk/debian/control 2007-05-28 14:35:04 UTC (rev 3625)
+++ openh323/trunk/debian/control 2007-05-28 15:16:24 UTC (rev 3626)
@@ -87,6 +87,11 @@
that can be used freely by everybody. This protocol is most used for
Voice over IP (VoIP) conferencing.
.
+ The static library comes in all three flavours:
+ libopenh323_s.a - notrace opt version
+ libopenh323_r_s.a - ptrace-enabled opt version
+ libopenh323_d_s.a - ptrace-enabled debug version
+ .
For more information on the OpenH323 project visit them at
http://www.voxgratia.org/
Modified: openh323/trunk/debian/rules
===================================================================
--- openh323/trunk/debian/rules 2007-05-28 14:35:04 UTC (rev 3625)
+++ openh323/trunk/debian/rules 2007-05-28 15:16:24 UTC (rev 3626)
@@ -69,8 +69,8 @@
touch autotools
build-arch-stamp: config.status
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/highopt optshared
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/highopt optnoshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/notrace optshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OH323_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 OH323_LIBDIR=$(CURDIR)/lib/opt optshared
@@ -82,7 +82,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 OH323_LIBDIR=$(CURDIR)/lib/highopt -C samples/simple optnoshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OH323_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 OH323_LIBDIR=$(CURDIR)/lib/opt -C samples/simple optnoshared
@@ -94,7 +94,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 OH323_LIBDIR=$(CURDIR)/lib/highopt -C samples/simple optshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/notrace -C samples/simple optshared
$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OH323_LIBDIR=$(CURDIR)/lib/opt -C samples/simple optshared
$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=d OH323_LIBDIR=$(CURDIR)/lib/debug -C samples/simple debugshared
if (samples/simple/obj_*_d/simph323 --help >/dev/null);then \
@@ -110,11 +110,11 @@
fi
LD_LIBRARY_PATH=$(CURDIR)/lib/opt samples/simple/obj_*_r/simph323 --help >/dev/null
if (samples/simple/obj_*_n/simph323 --help >/dev/null);then \
- echo shared highopt simph323 incorrectly compiled static; false;\
+ echo shared notrace simph323 incorrectly compiled static; false;\
else \
- echo shared highopt simph323 correctly compiled non-static; \
+ echo shared notrace simph323 correctly compiled non-static; \
fi
- LD_LIBRARY_PATH=$(CURDIR)/lib/highopt samples/simple/obj_*_n/simph323 --help >/dev/null
+ LD_LIBRARY_PATH=$(CURDIR)/lib/notrace samples/simple/obj_*_n/simph323 --help >/dev/null
#$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
#$(RM) -rf samples/simple/obj_*
# save it to install in package later...
@@ -165,11 +165,11 @@
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/libopenh323.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
+ install -m 755 lib/notrace/libopenh323.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
install -m 755 lib/opt/libopenh323.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-ptrace/usr/lib
install -m 755 lib/debug/libopenh323.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/highopt DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/notrace DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OH323_LIBDIR=$(CURDIR)/lib/opt DESTDIR=$(CURDIR)/debian/$(PACKAGE)-ptrace -C plugins install
$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=d OH323_LIBDIR=$(CURDIR)/lib/debug DESTDIR=$(CURDIR)/debian/$(PACKAGE)-develop -C plugins install
ifneq ($(SHLIBSVER),$(LIBH323COMPAT))
@@ -178,17 +178,15 @@
debian/$(PACKAGE)$$suffix/usr/lib/libopenh323.so.$(LIBH323COMPAT); \
done
endif
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/highopt INSTALL_DIR=$(CURDIR)/debian/simph323/usr -C samples/simple install
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/notrace INSTALL_DIR=$(CURDIR)/debian/simph323/usr -C samples/simple install
# clean simple to install it as a sample in the docs
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
-rmdir samples/simple/obj*
-# libopenh323-dbg package
- cp -v lib/opt/libopenh323_s.a debian/$(PACKAGE)-ptrace/usr/lib
- cp -v lib/debug/libopenh323_s.a debian/$(PACKAGE)-develop/usr/lib
-
# libopenh323-dev package
- cp -v lib/highopt/libopenh323*.a $(CURDIR)/debian/libopenh323-dev/usr/lib
+ cp -v lib/notrace/libopenh323_s.a /debian/libopenh323-dev/usr/lib
+ cp -v lib/opt/libopenh323_s.a debian/libopenh323-dev/usr/lib/libopenh323_r_s.a
+ cp -v lib/debug/libopenh323_s.a debian/libopenh323-dev/usr/lib/libopenh323_d_s.a
ln -s libopenh323.so.$(SHLIBSVER) debian/libopenh323-dev/usr/lib/libopenh323.so
ln -s libopenh323.so.$(SHLIBSVER) debian/libopenh323-dev/usr/lib/libopenh323.so.$(VER_MAJOR)
ln -s libopenh323.so.$(SHLIBSVER) debian/libopenh323-dev/usr/lib/libopenh323.so.$(VER_MAJOR).$(VER_MINOR)
More information about the Pkg-voip-commits
mailing list