Merge pull request #2 from dekkers/link-everything-correctly
Specify all necessary libraries when linking (thanks to Jeroen Dekkers)pull/1/merge
commit
1f64747b67
|
@ -25,4 +25,4 @@ $(SOGOD)_TOOL_LIBS += \
|
||||||
-lNGObjWeb \
|
-lNGObjWeb \
|
||||||
-lNGMime -lNGLdap \
|
-lNGMime -lNGLdap \
|
||||||
-lNGStreams -lNGExtensions -lEOControl \
|
-lNGStreams -lNGExtensions -lEOControl \
|
||||||
-lDOM -lXmlRpc -lSaxObjC
|
-lDOM -lSaxObjC
|
||||||
|
|
|
@ -6,7 +6,9 @@ libOGoContentStore_LIBRARIES_DEPEND_UPON += \
|
||||||
-lNGCards \
|
-lNGCards \
|
||||||
-lNGExtensions \
|
-lNGExtensions \
|
||||||
-lEOControl \
|
-lEOControl \
|
||||||
-lSaxObjC
|
-lSaxObjC \
|
||||||
|
-lgnustep-base \
|
||||||
|
-lobjc
|
||||||
|
|
||||||
ADDITIONAL_INCLUDE_DIRS += -I. -I.. -I../SOPE -I../SoObjects
|
ADDITIONAL_INCLUDE_DIRS += -I. -I.. -I../SOPE -I../SoObjects
|
||||||
|
|
||||||
|
|
|
@ -12,8 +12,7 @@ ADDITIONAL_INCLUDE_DIRS += -I. -I..
|
||||||
libGDLContentStore_LIBRARIES_DEPEND_UPON += \
|
libGDLContentStore_LIBRARIES_DEPEND_UPON += \
|
||||||
-lGDLAccess \
|
-lGDLAccess \
|
||||||
-lNGExtensions -lEOControl \
|
-lNGExtensions -lEOControl \
|
||||||
-lDOM -lSaxObjC \
|
-lgnustep-base -lobjc
|
||||||
-lgnustep-base
|
|
||||||
|
|
||||||
GDLContentStore_LIBRARIES_DEPEND_UPON += \
|
GDLContentStore_LIBRARIES_DEPEND_UPON += \
|
||||||
-framework GDLAccess \
|
-framework GDLAccess \
|
||||||
|
|
|
@ -20,9 +20,8 @@ ADDITIONAL_INCLUDE_DIRS += \
|
||||||
libNGCards_LIBRARIES_DEPEND_UPON += \
|
libNGCards_LIBRARIES_DEPEND_UPON += \
|
||||||
-lNGExtensions \
|
-lNGExtensions \
|
||||||
-lEOControl \
|
-lEOControl \
|
||||||
-lDOM \
|
|
||||||
-lSaxObjC \
|
-lSaxObjC \
|
||||||
-lgnustep-base
|
-lgnustep-base -lobjc -lm
|
||||||
|
|
||||||
NGCards_LIBRARIES_DEPEND_UPON += \
|
NGCards_LIBRARIES_DEPEND_UPON += \
|
||||||
-framework NGExtensions -framework EOControl \
|
-framework NGExtensions -framework EOControl \
|
||||||
|
|
|
@ -22,9 +22,9 @@ SOGo_LIBRARIES_DEPEND_UPON += \
|
||||||
-lNGCards \
|
-lNGCards \
|
||||||
-lNGMime \
|
-lNGMime \
|
||||||
-lNGStreams -lNGExtensions -lEOControl \
|
-lNGStreams -lNGExtensions -lEOControl \
|
||||||
-lXmlRpc -lDOM -lSaxObjC \
|
-lDOM -lSaxObjC \
|
||||||
-lNGLdap -lSBJson \
|
-lNGLdap -lSBJson \
|
||||||
-lGDLContentStore
|
-lGDLContentStore -lcrypto -lgnustep-base -lobjc -ldl
|
||||||
|
|
||||||
ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd)
|
ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd)
|
||||||
SOGo_LIBRARIES_DEPEND_UPON += -lcrypto
|
SOGo_LIBRARIES_DEPEND_UPON += -lcrypto
|
||||||
|
|
|
@ -31,6 +31,6 @@ BUNDLE_LIBS += \
|
||||||
-lNGObjWeb \
|
-lNGObjWeb \
|
||||||
-lNGCards -lNGMime -lNGLdap \
|
-lNGCards -lNGMime -lNGLdap \
|
||||||
-lNGStreams -lNGExtensions -lEOControl \
|
-lNGStreams -lNGExtensions -lEOControl \
|
||||||
-lXmlRpc -lDOM -lSaxObjC -lSBJson
|
-lDOM -lSaxObjC -lSBJson
|
||||||
|
|
||||||
ADDITIONAL_BUNDLE_LIBS += $(BUNDLE_LIBS)
|
ADDITIONAL_BUNDLE_LIBS += $(BUNDLE_LIBS)
|
||||||
|
|
|
@ -9,8 +9,8 @@ endif
|
||||||
libSOGoUI_LIBRARIES_DEPEND_UPON += \
|
libSOGoUI_LIBRARIES_DEPEND_UPON += \
|
||||||
-lNGObjWeb \
|
-lNGObjWeb \
|
||||||
-lNGMime \
|
-lNGMime \
|
||||||
-lNGStreams -lNGExtensions -lEOControl \
|
-lNGExtensions -lEOControl \
|
||||||
-lXmlRpc -lDOM -lSaxObjC -lWOExtensions
|
-lSaxObjC -lgnustep-base -lSOGo -lobjc
|
||||||
|
|
||||||
SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
|
SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
|
||||||
ADDITIONAL_INCLUDE_DIRS += -I../../SoObjects
|
ADDITIONAL_INCLUDE_DIRS += -I../../SoObjects
|
||||||
|
|
Loading…
Reference in New Issue