[Pkg-voip-commits] r3623 - pwlib/trunk/debian
kilian at alioth.debian.org
kilian at alioth.debian.org
Sun May 27 22:32:38 UTC 2007
Author: kilian
Date: 2007-05-27 22:32:38 +0000 (Sun, 27 May 2007)
New Revision: 3623
Modified:
pwlib/trunk/debian/rules
Log:
cleanups and sync with opal/openh323/pwlib-cvs
Modified: pwlib/trunk/debian/rules
===================================================================
--- pwlib/trunk/debian/rules 2007-05-27 22:29:18 UTC (rev 3622)
+++ pwlib/trunk/debian/rules 2007-05-27 22:32:38 UTC (rev 3623)
@@ -94,15 +94,15 @@
# --> make/ptbuildopts.mak
# -> make/common.mak
# PTLIB_BASE=pt
- # 1. shared, high optimized: DEBUG=0 P_SHAREDLIB=1 OBJDIR_SUFFIX= optshared
- # 2. static, high optimized: DEBUG=0 P_SHAREDLIB=0 OBJDIR_SUFFIX= optnoshared
+ # 1. shared, high optimized: DEBUG=0 P_SHAREDLIB=1 OBJDIR_SUFFIX=n optshared
+ # 2. static, high optimized: DEBUG=0 P_SHAREDLIB=0 OBJDIR_SUFFIX=n optnoshared
# CFLAGS += -DPTRACING=1
# 3. shared, with ptrace but opt: DEBUG=0 P_SHAREDLIB=1 OBJDIR_SUFFIX=r optshared
# 4. static, with ptrace but opt: DEBUG=0 P_SHAREDLIB=0 OBJDIR_SUFFIX=r optnoshared
# 5. shared, with debug and ptrace: DEBUG=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=d debugshared
# 6. static, with debug and ptrace: DEBUG=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=d debugnoshared
- $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS)" DEBUG= P_SHAREDLIB=1 OBJDIR_SUFFIX= PW_LIBDIR=$(CURDIR)/lib/highopt optshared
- $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS)" DEBUG= P_SHAREDLIB=0 OBJDIR_SUFFIX= PW_LIBDIR=$(CURDIR)/lib/highopt optnoshared
+ $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS)" DEBUG= P_SHAREDLIB=1 OBJDIR_SUFFIX=n PW_LIBDIR=$(CURDIR)/lib/notrace optshared
+ $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS)" DEBUG= P_SHAREDLIB=0 OBJDIR_SUFFIX=n PW_LIBDIR=$(CURDIR)/lib/notrace optnoshared
# put CFLAGS to build with PTRACING code
$(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" DEBUG= P_SHAREDLIB=1 OBJDIR_SUFFIX=r PW_LIBDIR=$(CURDIR)/lib/opt optshared
@@ -114,7 +114,7 @@
# ...in static
-$(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
$(RM) -rf samples/hello_world/obj_*
- $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS)" -C samples/hello_world/ DEBUG= P_SHAREDLIB=0 OBJDIR_SUFFIX= PW_LIBDIR=$(CURDIR)/lib/highopt optnoshared
+ $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS)" -C samples/hello_world/ DEBUG= P_SHAREDLIB=0 OBJDIR_SUFFIX=n PW_LIBDIR=$(CURDIR)/lib/notrace optnoshared
# put CFLAGS to build with PTRACING code
$(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" -C samples/hello_world/ DEBUG= P_SHAREDLIB=0 OBJDIR_SUFFIX=r PW_LIBDIR=$(CURDIR)/lib/opt optnoshared
@@ -127,7 +127,7 @@
# ...and in shared..
$(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
$(RM) -rf samples/hello_world/obj_*
- $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS)" -C samples/hello_world/ DEBUG= P_SHAREDLIB=1 OBJDIR_SUFFIX= PW_LIBDIR=$(CURDIR)/lib/highopt optshared
+ $(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS)" -C samples/hello_world/ DEBUG= P_SHAREDLIB=1 OBJDIR_SUFFIX=n PW_LIBDIR=$(CURDIR)/lib/notrace optshared
$(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" -C samples/hello_world/ DEBUG= P_SHAREDLIB=1 OBJDIR_SUFFIX=r PW_LIBDIR=$(CURDIR)/lib/opt optshared
$(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS) -DPTRACING=1" -C samples/hello_world/ DEBUG=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=d PW_LIBDIR=$(CURDIR)/lib/debug debugshared
if (samples/hello_world/obj_*_d/hello 2>/dev/null);then \
@@ -147,7 +147,7 @@
else \
echo opt hello_world sample correctly compiled non-static; \
fi
- LD_LIBRARY_PATH=$(CURDIR)/lib/highopt samples/hello_world/obj_*_/hello
+ LD_LIBRARY_PATH=$(CURDIR)/lib/notrace samples/hello_world/obj_*_/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
@@ -157,7 +157,7 @@
build-indep: build-indep-stamp
build-indep-stamp:
- $(MAKE) PWLIBDIR=$(CURDIR) docs
+ $(MAKE) docs
touch build-indep-stamp
clean: clean-patched unpatch
@@ -165,15 +165,16 @@
$(checkdir)
-rm -f build-arch-stamp build-indep-stamp patch-stamp
-if [ -f Makefile ];then \
- $(MAKE) PWLIBDIR=$(CURDIR) clean || true;\
+ $(MAKE) PWLIBDIR=$(CURDIR) clean || true ; \
+ $(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean||true ; \
fi
- $(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean||true
-rm -rf samples/hello_world/obj_*
-rm -f include/ptbuildopts.h
-rm -f Makefile config.log config.status autotools
-rm -f config.sub config.guess plugins/config.sub plugins/config.guess
+ -rm -f plugins/Makefile plugins/config.status plugins/config.log
-rm -rf lib
- -rm -f make/ptbuildopts.mak make/ptlib-config
+ -rm -f make/ptbuildopts.mak make/ptlib-config include/ptbuildopts.h
-rm -rf plugins/pwlib*
-rm -f plugins/Makefile plugins/config.status plugins/config.log
-rm -f `find . -name "*~"`
@@ -203,7 +204,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/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
+ install -m 755 lib/notrace/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
install -m 755 lib/opt/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-ptrace/usr/lib
install -m 755 lib/debug/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
ifneq ($(SHLIBSVER),$(LIBPTCOMPAT))
@@ -230,6 +231,7 @@
debian/$(PACKAGE)$$suffix/usr/lib/libpt.so.$(LIBPTCOMPAT4); \
done
endif
+ cp debian/libpt.docs debian/$(PACKAGE).docs
# libpt-dbg (will be filled by dh_strip)
@@ -243,7 +245,7 @@
sed -i -e 's#$$(PWLIBDIR)/include/ptlib/unix#/usr/include/ptlib/unix#g' \
-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/highopt/libpt_s.a debian/libpt-dev/usr/lib
+ 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
find debian/libpt-dev/usr/include -type f -exec chmod 644 {} \;
@@ -274,36 +276,35 @@
# should not be part of a distribution package:
-rm -f `find debian/libpt-dev/ -name "*.in"`
-
# plugins
#libpt-plugins-v4l
install -d -m 755 debian/libpt-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
- cp plugins/pwlib/device/videoinput/v4l_pwplugin.so \
+ cp plugins/pwlibn/device/videoinput/v4l_pwplugin.so \
debian/libpt-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
#libpt-plugins-v4l2
install -d -m 755 debian/libpt-plugins-v4l2/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
- cp plugins/pwlib/device/videoinput/v4l2_pwplugin.so \
+ cp plugins/pwlibn/device/videoinput/v4l2_pwplugin.so \
debian/libpt-plugins-v4l2/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
#libpt-plugins-avc
install -d -m 755 debian/libpt-plugins-avc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
- cp plugins/pwlib/device/videoinput/avc_pwplugin.so \
+ cp plugins/pwlibn/device/videoinput/avc_pwplugin.so \
debian/libpt-plugins-avc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
#libpt-plugins-dc
install -d -m 755 debian/libpt-plugins-dc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
- cp plugins/pwlib/device/videoinput/dc_pwplugin.so \
+ cp plugins/pwlibn/device/videoinput/dc_pwplugin.so \
debian/libpt-plugins-dc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
#libpt-plugins-oss
install -d -m 755 debian/libpt-plugins-oss/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
- cp plugins/pwlib/device/sound/oss_pwplugin.so \
+ cp plugins/pwlibn/device/sound/oss_pwplugin.so \
debian/libpt-plugins-oss/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
#libpt-plugins-alsa
install -d -m 755 debian/libpt-plugins-alsa/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
- cp plugins/pwlib/device/sound/alsa_pwplugin.so \
+ cp plugins/pwlibn/device/sound/alsa_pwplugin.so \
debian/libpt-plugins-alsa/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
install -d -m 755 debian/$(PACKAGE)-ptrace/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
@@ -327,9 +328,7 @@
debian/$(PACKAGE)-develop/usr/lib/pwlib/$(SHLIBSVER)/device/sound/; \
done
- cp debian/libpt.docs debian/$(PACKAGE).docs
-
# Must not depend on anything. This is to be called by
# binary-arch/binary-multi
# in another 'make' thread.
More information about the Pkg-voip-commits
mailing list