amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-05 10:29:43 +00:00
Code Issues Projects Releases Wiki Activity

merge of '8ac94a78bb2ff47a9c8c93921883f5d1ed948bae'

Browse Source 
and '95fd526cbec8bccb226bbd63d3442c7d12061aa3'

Monotone-Parent: 8ac94a78bb2ff47a9c8c93921883f5d1ed948bae
Monotone-Parent: 95fd526cbec8bccb226bbd63d3442c7d12061aa3
Monotone-Revision: a1ae082f345f010ed0903ee2ac6873682313ca49

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-06-17T13:19:18
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2011-06-17 13:19:18 +00:00
parent 70dfe9a782 310c6affbf
commit 8d93ffce6d
5 changed files with 70 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/GNUmakefile.preamble
+8 -2
View File
@@ -5,7 +5,7 @@ SOGo_INCLUDE_DIRS += -I.. -I../../UI \
-DSOGO_MINOR_VERSION="@\"$(MINOR_VERSION)\"" \
-DSOGO_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\""
HOSTNAME = $(shell hostname -f)
HOSTNAME ?= $(shell hostname -f)
BUILD_DATE = $(shell echo $$USER@$(HOSTNAME); date +"%Y%m%d%H%M")
ADDITIONAL_CPPFLAGS += \
@@ -21,10 +21,16 @@ SOGo_LIBRARIES_DEPEND_UPON += \
-lNGCards \
-lNGMime \
-lNGStreams -lNGExtensions -lEOControl \
-lXmlRpc -lDOM -lSaxObjC -lcrypt \
-lXmlRpc -lDOM -lSaxObjC \
-lNGLdap -lSBJson \
-lGDLContentStore
ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd)
SOGo_LIBRARIES_DEPEND_UPON += -lcrypto
else
SOGo_LIBRARIES_DEPEND_UPON += -lcrypt
endif
ADDITIONAL_TOOL_LIBS += \
-L$(GNUSTEP_OBJ_DIR)/ \
-lSOGo \