[Pkg-voip-commits] r6119 - /opal/branches/experimental/debian/rules

[dedu-guest at alioth.debian.org]

Author: dedu-guest
Date: Sun Aug 31 16:10:21 2008
New Revision: 6119

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6119
Log:
Fix get-orig-source and various minor fixes.

Modified:
    opal/branches/experimental/debian/rules

Modified: opal/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/rules?rev=6119&op=diff
==============================================================================
--- opal/branches/experimental/debian/rules (original)
+++ opal/branches/experimental/debian/rules Sun Aug 31 16:10:21 2008
@@ -19,7 +19,7 @@
         SHLIBSSUFFIX :=$(VER_MAJOR).$(VER_MINOR)-beta$(VER_SUB)
 endif
 
-CFLAGS := -g
+CFLAGS := -g -O2
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
@@ -71,21 +71,21 @@
 	touch $@
 
 build-arch-stamp: config.status
-	$(MAKE) $(MAKE_BUILD_PARAM) P_SHAREDLIB=1 optshared
-	$(MAKE) $(MAKE_BUILD_PARAM) P_SHAREDLIB=0 optnoshared
+	$(MAKE) $(MAKE_BUILD_PARAM) optshared
+	$(MAKE) $(MAKE_BUILD_PARAM) optnoshared
 
 	# 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) P_SHAREDLIB=0 -C samples/simple optnoshared
+	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple optnoshared
 
 	samples/simple/obj_*_r/simpleopal --help >/dev/null
 	## then shared...
 	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
 	$(RM) -rf samples/simple/obj_*
-	$(MAKE) $(MAKE_BUILD_PARAM) P_SHAREDLIB=1 -C samples/simple optshared
+	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple optshared
 	if (samples/simple/obj_*_r/simpleopal --help >/dev/null);then \
 		echo shared opt simpleopal incorrectly compiled static; false;\
 	else \
@@ -143,7 +143,7 @@
 	install -d -m 755 $(CURDIR)/debian/$(PACKAGE)/usr/lib
 	install -m 755 lib/libopal.so.*.*[.-]* $(CURDIR)/debian/$(PACKAGE)/usr/lib
 
-	$(MAKE) $(MAKE_BUILD_PARAM) P_SHAREDLIB=1 DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
+	$(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
 	mkdir debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)
 	#- because cannot move a directory into itself
 	-mv debian/$(PACKAGE)/usr/lib/ptlib/* debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)
@@ -155,7 +155,7 @@
 	-rm debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)/plugins/codec/video/mpeg4*
 
 	# simpleopal
-	$(MAKE) $(MAKE_BUILD_PARAM) P_SHAREDLIB=1 INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
+	$(MAKE) $(MAKE_BUILD_PARAM) 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_*
@@ -243,24 +243,22 @@
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	#this is for stable versions
-	#@@echo Downloading $(UPFILENAME) from $(URL) ...
-	#@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
-	#@@echo 'Repacking as DFSG-free (removing iLBC)...'
-	#@@mkdir -p ../tarballs/opal-$(UPVERSION).tmp/
-	#@@cd ../tarballs/opal-$(UPVERSION).tmp ; \
-	#  tar xfz ../$(UPFILENAME)
-	#@@rm -rf ../tarballs/opal-$(UPVERSION).tmp/opal*/src/codec/iLBC \
-	#  ../tarballs/opal-$(UPVERSION).tmp/opal*/include/codec/ilbccodec.h
-	#@@echo Writing archive ../tarballs/$(FILENAME) ...
-	#@@cd ../tarballs/opal-$(UPVERSION).tmp ; \
-	#tar cfz ../$(FILENAME) *
-	#@@echo Cleaning up...
-	#@@$(RM) -rf ../tarballs/opal-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
-	#and this is for SVN
-	@@echo Checking out for repacking (might take 15 min) ...
+	@@#this is for stable versions
+	@@#echo Downloading $(UPFILENAME) from $(URL) ...
+	@@#wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+	@@#echo 'Repacking as DFSG-free (removing iLBC)...'
+	@@#mkdir -p ../tarballs/opal-$(UPVERSION).tmp/
+	@@#cd ../tarballs/opal-$(UPVERSION).tmp ; tar xfz ../$(UPFILENAME)
+	@@#rm -rf ../tarballs/opal-$(UPVERSION).tmp/opal*/src/codec/iLBC \
+	@@#../tarballs/opal-$(UPVERSION).tmp/opal*/include/codec/ilbccodec.h
+	@@#echo Writing archive ../tarballs/$(FILENAME) ...
+	@@#cd ../tarballs/opal-$(UPVERSION).tmp ; tar cfz ../$(FILENAME) *
+	@@#echo Cleaning up...
+	@@#$(RM) -rf ../tarballs/opal-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
+	@@#and this is for SVN
+	@@echo 'Checking out for repacking (might take 15 min) ...'
 	@@svn co https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/trunk opal@$(REV) ../tarballs/opal-$(REV).tmp
-	@@echo Getting the changelog (might take 15 min) ...
+	@@echo 'Getting the changelog (might take 15 min) ...'
 	@@cd ../tarballs/opal-$(REV).tmp; svn2cl -o changelog
 	@@echo Creating the tarball ...
 	@@cd ../tarballs/opal-$(REV).tmp; find . -name .svn -exec rm -rf {} \; ; tar zcf ../opal.orig.tar.gz *