From 20f382bf10e511f0fd6cc316cada4409a65d5cc4 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 7 Dec 2011 16:13:52 +0000
Subject: [PATCH] Monotone-Parent: 2f66e7e50e9a88d5279a512e70f1bd7c6c5c6531
 Monotone-Revision: 2e3d14f0015946767d3494c454c4d2e977e1da15

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-12-07T16:13:52
Monotone-Branch: ca.inverse.sogo
---
 OpenChange/GNUmakefile | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile
index 3af4c776e..7452c39fc 100644
--- a/OpenChange/GNUmakefile
+++ b/OpenChange/GNUmakefile
@@ -14,7 +14,6 @@ MAPISTORESOGO = MAPIStoreSOGo
 LIBRARY_NAME = $(MAPISTORESOGO)
 
 $(MAPISTORESOGO)_VERSION = $(BACKEND_VERSION)
-$(MAPISTORESOGO)_INSTALL_DIR = $(DESTDIR)/$(SAMBA_LIB_DIR)/mapistore_backends
 
 $(MAPISTORESOGO)_OBJC_FILES += \
 	MAPIStoreSOGo.m
@@ -27,9 +26,7 @@ BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR)
 
 UNRTF_DIR = unrtf-$(UNRTF_VERSION)
 
-$(SOGOBACKEND)_CPPFLAGS += -I$(UNRTF_DIR)/src
-
-$(SOGOBACKEND)_SUBPROJECTS = $(UNRTF_DIR)/src
+$(SOGOBACKEND)_SUBPROJECTS += $(UNRTF_DIR)/src
 
 $(SOGOBACKEND)_PRINCIPAL_CLASS = MAPIApplication
 
@@ -167,29 +164,34 @@ all install::
 	@echo "Cannot build the OpenChange SOGo backend (empty CFLAGS for libmapistore)"
 else
 
+SAMBA_LIB_DIR = $(shell pkg-config libmapistore --variable=libdir)
+
 LIBMAPI_LIBS = $(shell pkg-config libmapi --libs)
 
 LIBMAPISTORE_CFLAGS = $(shell pkg-config libmapistore --cflags) -DSAMBA_PREFIX="\"$(shell pkg-config libmapistore --variable=prefix)\""
 LIBMAPISTORE_LIBS = $(shell pkg-config libmapistore --libs) -lmapiproxy
 
+$(MAPISTORESOGO)_INSTALL_DIR = $(DESTDIR)/$(SAMBA_LIB_DIR)/mapistore_backends
+$(MAPISTORESOGO)_LDFLAGS += \
+        -L../SoObjects/SOGo/SOGo.framework/ -lSOGo \
+	$(LIBMAPI_LIBS) \
+	$(LIBMAPISTORE_LIBS)
+
+$(SOGOBACKEND)_LDFLAGS += \
+        -L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ -lOGoContentStore \
+        -L../SoObjects/SOGo/SOGo.framework/ -lSOGo \
+	$(LIBMAPI_LIBS) \
+	$(LIBMAPISTORE_LIBS)
+
 ADDITIONAL_INCLUDE_DIRS += \
 	-Werror -Wall \
 	$(LIBMAPI_CFLAGS) \
 	$(LIBMAPISTORE_CFLAGS) \
+	-I$(UNRTF_DIR)/src \
 	-I../SoObjects -I../SOPE \
 	-DBACKEND_BUNDLE_NAME="@\"$(BUNDLE_NAME)$(BUNDLE_EXTENSION)\"" \
 	-DSOGO_BUNDLES_DIR="@\"$(BUNDLE_INSTALL_DIR)\""
 
-ADDITIONAL_LIB_DIRS += -Wl,--no-as-needed
-
-SAMBA_LIB_DIR = $(shell pkg-config libmapistore --variable=libdir)
-
-$(SOGOBACKEND)_LDFLAGS += \
-         $(LIBMAPI_LIBS) \
-         $(LIBMAPISTORE_LIBS) \
-        -L../SoObjects/SOGo/SOGo.framework/ -lSOGo \
-        -L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ -lOGoContentStore
-
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 include $(GNUSTEP_MAKEFILES)/library.make