[Pkg-samba-maint] r2962 - in trunk/openchange: . debian

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-07-18 16:25:00 +0000 (Sat, 18 Jul 2009)
New Revision: 2962

Modified:
   trunk/openchange/Makefile
   trunk/openchange/debian/rules
Log:
Merge LDFLAGS fix.

Modified: trunk/openchange/Makefile
===================================================================
--- trunk/openchange/Makefile	2009-07-18 14:56:08 UTC (rev 2961)
+++ trunk/openchange/Makefile	2009-07-18 16:25:00 UTC (rev 2962)
@@ -887,6 +887,7 @@
 	@$(CC) -o $@ $(DSOOPT) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION) $^ -L. $(LIBS)
 
 mapiproxy/libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION): libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)
+	ln -fs $< $@
 
 #####################
 # mapistore backends
@@ -1190,7 +1191,7 @@
 			utils/openchange-tools.o			\
 			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking $@"
-	@$(CC) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt
+	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt
 
 
 ###################

Modified: trunk/openchange/debian/rules
===================================================================
--- trunk/openchange/debian/rules	2009-07-18 14:56:08 UTC (rev 2961)
+++ trunk/openchange/debian/rules	2009-07-18 16:25:00 UTC (rev 2962)
@@ -2,6 +2,7 @@
 # By Jelmer Vernooij <jelmer at samba.org>
 #
 LDFLAGS = -Wl,--as-needed
+DSOOPT = -shared -Wl,--as-needed -fPIC
 
 configure: configure-stamp
 configure-stamp:
@@ -16,7 +17,7 @@
 build: build-stamp
 build-stamp: configure
 	dh_testdir
-	$(MAKE) datadir=/usr/share/openchange LDFLAGS="$(LDFLAGS)" all
+	$(MAKE) datadir=/usr/share/openchange LDFLAGS="$(LDFLAGS)" DSOOPT="$(DSOOPT)" all
 	touch $@
 
 clean: