From d1273a98cc929d8201c59ca5917475bcc889b4ce Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 25 Jan 2010 16:58:00 +0000 Subject: [PATCH] Monotone-Parent: 4b92bd8e12e3f79e2ba6838787a30729a0b2a4cb Monotone-Revision: 6f5c035d96f070f88090c5a76cf84a2452518927 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-01-25T16:58:00 Monotone-Branch: ca.inverse.sogo --- SOPE/GDLContentStore/GNUmakefile.preamble | 12 ++++++++---- SOPE/NGCards/GNUmakefile.preamble | 6 +++--- .../versitCardsSaxDriver/GNUmakefile.preamble | 2 ++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/SOPE/GDLContentStore/GNUmakefile.preamble b/SOPE/GDLContentStore/GNUmakefile.preamble index 4ef86a822..58c1401f1 100644 --- a/SOPE/GDLContentStore/GNUmakefile.preamble +++ b/SOPE/GDLContentStore/GNUmakefile.preamble @@ -12,23 +12,27 @@ ADDITIONAL_INCLUDE_DIRS += -I. -I.. libGDLContentStore_LIBRARIES_DEPEND_UPON += \ -lGDLAccess \ -lNGExtensions -lEOControl \ - -lDOM -lSaxObjC + -lDOM -lSaxObjC \ + -lgnustep-base GDLContentStore_LIBRARIES_DEPEND_UPON += \ -framework GDLAccess \ -framework NGExtensions -framework EOControl \ - -framework DOM -framework SaxObjC + -framework DOM -framework SaxObjC \ + -framework Foundation ifneq ($(frameworks),yes) GCS_TOOL_LIBS += \ -lGDLContentStore -lGDLAccess \ -lNGExtensions -lEOControl \ - -lDOM -lSaxObjC + -lDOM -lSaxObjC \ + -lgnustep-base else GCS_TOOL_LIBS += \ -framework GDLContentStore -framework GDLAccess \ -framework NGExtensions -framework EOControl \ - -framework DOM -framework SaxObjC + -framework DOM -framework SaxObjC \ + -framework Foundation endif gcs_ls_TOOL_LIBS += $(GCS_TOOL_LIBS) diff --git a/SOPE/NGCards/GNUmakefile.preamble b/SOPE/NGCards/GNUmakefile.preamble index 0f6c0a405..e178ea521 100644 --- a/SOPE/NGCards/GNUmakefile.preamble +++ b/SOPE/NGCards/GNUmakefile.preamble @@ -21,12 +21,12 @@ libNGCards_LIBRARIES_DEPEND_UPON += \ -lNGExtensions \ -lEOControl \ -lDOM \ - -lSaxObjC + -lSaxObjC \ + -lgnustep-base NGCards_LIBRARIES_DEPEND_UPON += \ -framework NGExtensions -framework EOControl \ - -framework DOM -framework SaxObjC - + -framework DOM -framework SaxObjC -framework Foundation # library/framework search pathes diff --git a/SOPE/NGCards/versitCardsSaxDriver/GNUmakefile.preamble b/SOPE/NGCards/versitCardsSaxDriver/GNUmakefile.preamble index eb3ae25e4..cca047111 100644 --- a/SOPE/NGCards/versitCardsSaxDriver/GNUmakefile.preamble +++ b/SOPE/NGCards/versitCardsSaxDriver/GNUmakefile.preamble @@ -1,5 +1,7 @@ # compilation settings +NEEDS_GUI=no + SOPE_ROOT=../.. SOPE_OBJ_ROOT=$(GNUSTEP_BUILD_DIR)/$(SOPE_ROOT)