From 75affd091652c63e4033f9a86f61e6d9529e4403 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 2 Dec 2011 17:33:24 +0000 Subject: [PATCH] Monotone-Parent: 2506be68868e083a9761fa080be7b4b2897d0e1f Monotone-Revision: 4d3f50d88285ef257187d5b0f373556518a717ac Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-12-02T17:33:24 Monotone-Branch: ca.inverse.sogo --- OpenChange/GNUmakefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile index 4a0171582..a0caf30be 100644 --- a/OpenChange/GNUmakefile +++ b/OpenChange/GNUmakefile @@ -133,6 +133,12 @@ $(SOGOBACKEND)_RESOURCE_FILES += \ $(UNRTF_DIR)/charmaps/SYMBOL.charmap \ $(UNRTF_DIR)/outputs/html.conf +$(SOGOBACKEND)_LDFLAGS += \ + $(LIBMAPI_LIBS) \ + $(LIBMAPISTORE_LIBS) \ + -L../SoObjects/SOGo/SOGo.framework/ -lSOGo \ + -L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ -lOGoContentStore + ### unrtf all:: $(UNRTF_DIR)/config.h $(UNRTF_DIR)/src/GNUmakefile @@ -178,11 +184,8 @@ ADDITIONAL_INCLUDE_DIRS += \ -I../SoObjects -I../SOPE \ -DBACKEND_BUNDLE_NAME="@\"$(BUNDLE_NAME)$(BUNDLE_EXTENSION)\"" \ -DSOGO_BUNDLES_DIR="@\"$(BUNDLE_INSTALL_DIR)\"" -ADDITIONAL_LIB_DIRS += -Wl,--no-as-needed \ - -L../SoObjects/SOGo/SOGo.framework/ -lSOGo \ - -L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ -lOGoContentStore \ - $(LIBMAPI_LIBS) \ - $(LIBMAPISTORE_LIBS) + +ADDITIONAL_LIB_DIRS += -Wl,--no-as-needed SAMBA_LIB_DIR = $(shell pkg-config libmapistore --variable=libdir)