amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-02-17 07:33:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from dekkers/link-everything-correctly

Browse Source 
Specify all necessary libraries when linking (thanks to Jeroen Dekkers)
This commit is contained in:
Wolfgang Sourdeau
2012-10-20 12:15:23 -07:00
parent db19cae692 990911e142
commit 1f64747b67
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Main/GNUmakefile.preamble
View File

@@ -25,4 +25,4 @@ $(SOGOD)_TOOL_LIBS += \
-lNGObjWeb \
-lNGMime -lNGLdap \
-lNGStreams -lNGExtensions -lEOControl \
-lDOM -lXmlRpc -lSaxObjC
-lDOM -lSaxObjC

4
OGoContentStore/GNUmakefile.preamble
View File

@@ -6,7 +6,9 @@ libOGoContentStore_LIBRARIES_DEPEND_UPON += \
-lNGCards \
-lNGExtensions \
-lEOControl \
-lSaxObjC
-lSaxObjC \
-lgnustep-base \
-lobjc
ADDITIONAL_INCLUDE_DIRS += -I. -I.. -I../SOPE -I../SoObjects

3
SOPE/GDLContentStore/GNUmakefile.preamble
View File

@@ -12,8 +12,7 @@ ADDITIONAL_INCLUDE_DIRS += -I. -I..
libGDLContentStore_LIBRARIES_DEPEND_UPON += \
-lGDLAccess \
-lNGExtensions -lEOControl \
-lDOM -lSaxObjC \
-lgnustep-base
-lgnustep-base -lobjc
GDLContentStore_LIBRARIES_DEPEND_UPON += \
-framework GDLAccess \

3
SOPE/NGCards/GNUmakefile.preamble
View File

@@ -20,9 +20,8 @@ ADDITIONAL_INCLUDE_DIRS += \
libNGCards_LIBRARIES_DEPEND_UPON += \
-lNGExtensions \
-lEOControl \
-lDOM \
-lSaxObjC \
-lgnustep-base
-lgnustep-base -lobjc -lm
NGCards_LIBRARIES_DEPEND_UPON += \
-framework NGExtensions -framework EOControl \

4
SoObjects/SOGo/GNUmakefile.preamble
View File

@@ -22,9 +22,9 @@ SOGo_LIBRARIES_DEPEND_UPON += \
-lNGCards \
-lNGMime \
-lNGStreams -lNGExtensions -lEOControl \
-lXmlRpc -lDOM -lSaxObjC \
-lDOM -lSaxObjC \
-lNGLdap -lSBJson \
-lGDLContentStore
-lGDLContentStore -lcrypto -lgnustep-base -lobjc -ldl
ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd)
SOGo_LIBRARIES_DEPEND_UPON += -lcrypto

2
SoObjects/common.make
View File

@@ -31,6 +31,6 @@ BUNDLE_LIBS += \
-lNGObjWeb \
-lNGCards -lNGMime -lNGLdap \
-lNGStreams -lNGExtensions -lEOControl \
-lXmlRpc -lDOM -lSaxObjC -lSBJson
-lDOM -lSaxObjC -lSBJson
ADDITIONAL_BUNDLE_LIBS += $(BUNDLE_LIBS)

4
UI/SOGoUI/GNUmakefile.preamble
View File

@@ -9,8 +9,8 @@ endif
libSOGoUI_LIBRARIES_DEPEND_UPON += \
-lNGObjWeb \
-lNGMime \
-lNGStreams -lNGExtensions -lEOControl \
-lXmlRpc -lDOM -lSaxObjC -lWOExtensions
-lNGExtensions -lEOControl \
-lSaxObjC -lgnustep-base -lSOGo -lobjc
SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
ADDITIONAL_INCLUDE_DIRS += -I../../SoObjects