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

[dedu-guest at alioth.debian.org]

Author: dedu-guest
Date: Tue Nov 18 11:10:22 2008
New Revision: 6481

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6481
Log:
Simplify rules file.

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=6481&op=diff
==============================================================================
--- opal/branches/experimental/debian/rules (original)
+++ opal/branches/experimental/debian/rules Tue Nov 18 11:10:22 2008
@@ -1,16 +1,9 @@
 #!/usr/bin/make -f
-
 
 DEBVERSION := $(shell head -n 1 debian/changelog \
                     | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 UPVERSION := $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://' -e 's/-[0-9.]*(\+b[0-9])?$$//' -e 's/.dfsg[0-9]*$$//')
 
-REV := $(shell echo $(UPVERSION) | sed -r -e 's/^.*svn//')
-#REV=20797
-
-DEBVERSION := $(shell head -n 1 debian/changelog \
-		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-#UPVERSION := $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://' -e 's/-[0-9.]*(\+b[0-9])?$$//' -e 's/.dfsg[0-9]*$$//')
 #URLVERSION := $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://' -e 's/-[0-9.]*(\+b[0-9])?$$//' -e 's/.dfsg[0-9]*$$//' -e 's/\./_/g')
 
 FILENAME := opal_$(UPVERSION)~dfsg.orig.tar.gz
@@ -18,7 +11,10 @@
 #URL := http://www.voxgratia.org/releases/opal-v$(URLVERSION)-src-tar.gz
 URL := http://ftp.gnome.org/pub/gnome/sources/opal/3.4/opal-$(UPVERSION).tar.gz
 
-PACKAGE=libopal3.4.2
+REV := $(shell echo $(UPVERSION) | sed -r -e 's/^.*svn//')
+#REV=20797
+
+PACKAGE=libopal$(UPVERSION)
 
 #ifneq (,$(shell test -f version.h&&grep MAJOR_VERSION version.h))
 #VER_MAJOR := $(shell awk '/MAJOR_VERSION/ { print $$3 }' version.h 2>/dev/null)
@@ -27,17 +23,13 @@
 #VER_TYPE  := $(shell awk '/BUILD_TYPE/    { print $$3 }' version.h 2>/dev/null)
 #endif
 
-#SHLIBSVER := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
 #SHLIBSSUFFIX := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
 #ifneq (,$(findstring Beta,$(VER_TYPE)))
 #        SHLIBSSUFFIX :=$(VER_MAJOR).$(VER_MINOR)-beta$(VER_SUB)
 #endif
 
-CFLAGS := -Wall -g -O2
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-endif
+CFLAGS   += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+LDFLAGS += -Wl,-z,def
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -47,9 +39,6 @@
 else
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
-# Ensure the build aborts when there are still references to undefined
-# symbols.
-LDFLAGS += -Wl,-z,def
 
 include /usr/share/dpatch/dpatch.make