Use the output of "gnustep-config --base-libs" to determine which libs our libraries must be linked against
parent
160aa42b88
commit
3f58b6bfd1
|
@ -7,8 +7,7 @@ libOGoContentStore_LIBRARIES_DEPEND_UPON += \
|
|||
-lNGExtensions \
|
||||
-lEOControl \
|
||||
-lSaxObjC \
|
||||
-lgnustep-base \
|
||||
-lobjc
|
||||
$(BASE_LIBS)
|
||||
|
||||
ADDITIONAL_INCLUDE_DIRS += -I. -I.. -I../SOPE -I../SoObjects
|
||||
|
||||
|
@ -29,4 +28,5 @@ test_quick_extract_TOOL_LIBS += \
|
|||
-lNGCards \
|
||||
-lGDLContentStore \
|
||||
-lGDLAccess \
|
||||
-lOGoContentStore
|
||||
-lOGoContentStore \
|
||||
$(BASE_LIBS)
|
||||
|
|
|
@ -8,11 +8,12 @@ ADDITIONAL_INCLUDE_DIRS += -I. -I..
|
|||
|
||||
|
||||
# dependencies
|
||||
BASE_LIBS := $(shell gnustep-config --base-libs)
|
||||
|
||||
libGDLContentStore_LIBRARIES_DEPEND_UPON += \
|
||||
-lGDLAccess \
|
||||
-lNGExtensions -lEOControl \
|
||||
-lgnustep-base -lobjc
|
||||
$(BASE_LIBS)
|
||||
|
||||
GDLContentStore_LIBRARIES_DEPEND_UPON += \
|
||||
-framework GDLAccess \
|
||||
|
@ -25,7 +26,7 @@ GCS_TOOL_LIBS += \
|
|||
-lGDLContentStore -lGDLAccess \
|
||||
-lNGExtensions -lEOControl \
|
||||
-lDOM -lSaxObjC \
|
||||
-lgnustep-base
|
||||
$(BASE_LIBS)
|
||||
else
|
||||
GCS_TOOL_LIBS += \
|
||||
-framework GDLContentStore -framework GDLAccess \
|
||||
|
|
|
@ -17,11 +17,13 @@ ADDITIONAL_INCLUDE_DIRS += \
|
|||
|
||||
# dependencies
|
||||
|
||||
BASE_LIBS := $(shell gnustep-config --base-libs)
|
||||
|
||||
libNGCards_LIBRARIES_DEPEND_UPON += \
|
||||
-lNGExtensions \
|
||||
-lEOControl \
|
||||
-lSaxObjC \
|
||||
-lgnustep-base -lobjc -lm
|
||||
$(BASE_LIBS)
|
||||
|
||||
NGCards_LIBRARIES_DEPEND_UPON += \
|
||||
-framework NGExtensions -framework EOControl \
|
||||
|
|
|
@ -24,7 +24,8 @@ SOGo_LIBRARIES_DEPEND_UPON += \
|
|||
-lNGStreams -lNGExtensions -lEOControl \
|
||||
-lDOM -lSaxObjC \
|
||||
-lNGLdap -lSBJson \
|
||||
-lGDLContentStore -lgnustep-base -lobjc -ldl
|
||||
-lGDLContentStore \
|
||||
$(BASE_LIBS)
|
||||
|
||||
ifeq ($(HAS_LIBRARY_gnutls),yes)
|
||||
ADDITIONAL_CPPFLAGS += -DHAVE_GNUTLS=1
|
||||
|
|
|
@ -10,7 +10,8 @@ libSOGoUI_LIBRARIES_DEPEND_UPON += \
|
|||
-lNGObjWeb \
|
||||
-lNGMime \
|
||||
-lNGExtensions -lEOControl \
|
||||
-lSaxObjC -lgnustep-base -lSOGo -lobjc
|
||||
-lSaxObjC -lSOGo \
|
||||
$(BASE_LIBS)
|
||||
|
||||
SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
|
||||
ADDITIONAL_INCLUDE_DIRS += -I../../SoObjects
|
||||
|
|
|
@ -42,5 +42,5 @@ endif
|
|||
SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
|
||||
|
||||
BUNDLE_LIBS += \
|
||||
-lSOGoUI \
|
||||
-lSOGoUI \
|
||||
-lSOGo
|
||||
|
|
Loading…
Reference in New Issue