[med-svn] r13804 - trunk/packages/libzeep/trunk/debian/patches

[Maarten Hekkelman]

Author: mhekkel-guest
Date: 2013-06-03 07:05:10 +0000 (Mon, 03 Jun 2013)
New Revision: 13804

Modified:
   trunk/packages/libzeep/trunk/debian/patches/makefile.diff
Log:
updated for makefile changes

Modified: trunk/packages/libzeep/trunk/debian/patches/makefile.diff
===================================================================
--- trunk/packages/libzeep/trunk/debian/patches/makefile.diff	2013-06-03 03:34:20 UTC (rev 13803)
+++ trunk/packages/libzeep/trunk/debian/patches/makefile.diff	2013-06-03 07:05:10 UTC (rev 13804)
@@ -10,41 +10,45 @@
  # You may have to edit the first three defines on top of this
  # makefile to match your current installation.
  
--#BOOST_LIB_SUFFIX	= # e.g. '-mt'
--#BOOST				= $(HOME)/projects/boost
--BOOST_LIB_DIR		= $(BOOST:%=%/lib)
--BOOST_INC_DIR		= $(BOOST:%=%/include)
+-#BOOST_LIB_SUFFIX   = # e.g. '-mt'
+-#BOOST              = $(HOME)/projects/boost
+-BOOST_LIB_DIR       = $(BOOST:%=%/lib)
+-BOOST_INC_DIR       = $(BOOST:%=%/include)
 -
--PREFIX				?= /usr/local
--LIBDIR				?= $(PREFIX)/lib
--INCDIR				?= $(PREFIX)/include
--MANDIR				?= $(PREFIX)/man/man3
--DOCDIR				?= $(PREFIX)/share/libzeep
-+LIBDIR				= $(DESTDIR)/usr/lib
-+INCDIR				= $(DESTDIR)/usr/include
-+MANDIR				= $(DESTDIR)/usr/share/man/man3
-+DOCDIR				= $(DESTDIR)/usr/share/doc/libzeep-dev
+-PREFIX              ?= /usr/local
+-LIBDIR              ?= $(PREFIX)/lib
+-INCDIR              ?= $(PREFIX)/include
+-MANDIR              ?= $(PREFIX)/man/man3
+-DOCDIR              ?= $(PREFIX)/share/libzeep
++LIBDIR              = $(DESTDIR)/usr/lib
++INCDIR              = $(DESTDIR)/usr/include
++MANDIR              = $(DESTDIR)/usr/share/man/man3
++DOCDIR              = $(DESTDIR)/usr/share/doc/libzeep-dev
 +
 +CXXFLAGS            := $(shell dpkg-buildflags --get CXXFLAGS)
 +CXXFLAGS            += $(shell dpkg-buildflags --get CPPFLAGS)
 +LDFLAGS             := $(shell dpkg-buildflags --get LDFLAGS)
  
- BOOST_LIBS			= system thread filesystem regex math_c99
- BOOST_LIBS			:= $(BOOST_LIBS:%=boost_%$(BOOST_LIB_SUFFIX))
-@@ -32,10 +30,8 @@
- LIB_NAME			= $(SO_NAME).$(VERSION_MINOR)
+ BOOST_LIBS          = system thread filesystem regex math_c99
+ BOOST_LIBS          := $(BOOST_LIBS:%=boost_%$(BOOST_LIB_SUFFIX))
+@@ -31,12 +29,10 @@
+ SO_NAME             = libzeep.so.$(VERSION_MAJOR)
+ LIB_NAME            = $(SO_NAME).$(VERSION_MINOR)
  
- CXX					?= c++
--CFLAGS				+= -O2 $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -shared -std=c++0x
--#CFLAGS				+= -g $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -shared # -std=c++0x
--CFLAGS				+= -Wall
--CFLAGS				+= -g
-+CXXFLAGS			+= -O2 -I. -fPIC -pthread -shared -std=c++0x
-+CXXFLAGS			+= -Wall
+-CXX                 ?= c++
+-CFLAGS              += -O2 $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -shared -std=c++0x
+-#CFLAGS             += -g $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -shared # -std=c++0x
+-CFLAGS              += -Wall
+-CFLAGS              += -g
+-LD                  ?= ld
++CXX                 ?= c++
++CXXFLAGS            += -O2 -I. -fPIC -pthread -shared -std=c++0x
++CXXFLAGS            += -Wall
++LD                  ?= ld
  
  VPATH += src
  
-@@ -59,7 +55,7 @@
+@@ -60,7 +56,7 @@
  	obj/xpath.o \
  	obj/writer.o
  
@@ -53,7 +57,7 @@
  
  libzeep.a: $(OBJECTS)
  	ld -r -o $@ $(OBJECTS)
-@@ -112,8 +108,6 @@
+@@ -113,8 +109,6 @@
  	for d in . images libzeep zeep zeep/http zeep/http/preforked_server_base zeep/http/el \
  		zeep/http/el/object zeep/xml zeep/xml/doctype zeep/xml/container zeep/xml/element \
  		index; do install -d $(DOCDIR)/$$d; install doc/html/$$d/*.* $(DOCDIR)/$$d; done;
@@ -62,7 +66,7 @@
  	ln -Tfs $(LIB_NAME) $(LIBDIR)/libzeep.so
  
  install: install-libs install-dev
-@@ -128,7 +122,7 @@
+@@ -129,7 +123,7 @@
  	cp $(DIST_NAME).tgz ../ppa/libzeep_$(VERSION).orig.tar.gz
  
  obj/%.o: %.cpp | obj
@@ -71,7 +75,7 @@
  
  obj:
  	mkdir -p obj
-@@ -137,8 +131,5 @@
+@@ -138,8 +132,5 @@
  
  $(OBJECTS:.o=.d):