LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 4d3f50d88285ef257187d5b0f373556518a717ac 

Monotone-Revision: 7671984f4de4c2e75f994c09f3c03934090088b2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-12-02T20:59:22
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-12-02 20:59:22 +00:00
parent 75affd0916
commit e2a4a1b2a6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenChange/GNUmakefile
View File

@ -133,12 +133,6 @@ $(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
@ -167,7 +161,6 @@ TEST_TOOL_NAME += $(PLREADER_TOOL)
### cflags and libs
LIBMAPI_CFLAGS = $(shell pkg-config libmapi --cflags)
LIBMAPISTORE_CFLAGS = $(shell pkg-config libmapistore --cflags) -DSAMBA_PREFIX="\"$(shell pkg-config libmapistore --variable=prefix)\""
ifeq ($(LIBMAPI_CFLAGS),)
all install::
@ -175,6 +168,8 @@ all install::
else
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
ADDITIONAL_INCLUDE_DIRS += \
@ -189,6 +184,12 @@ 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