work on OSX frameworks

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1030 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/ChangeLog b/sope-appserver/ChangeLog
index 599748db0825b11b4736e056b848ef812791d24f..eb6292bd51e2114da42af63022f08b7c0b05b75d 100644 (file)
--- a/sope-appserver/ChangeLog
+++ b/sope-appserver/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-11  Helge Hess  <helge.hess@opengroupware.org>
+
+       * more work on OSX framework support
+
 2005-08-10  Helge Hess  <helge.hess@opengroupware.org>
 
        * prepared for OSX frameworks

diff --git a/sope-appserver/SoOFS/GNUmakefile b/sope-appserver/SoOFS/GNUmakefile
index a4639ff9d83ada36dcd8f0d57861ab072dfec2c0..91f046f95a81cfb3420cb8e83b9543769435275e 100644 (file)
--- a/sope-appserver/SoOFS/GNUmakefile
+++ b/sope-appserver/SoOFS/GNUmakefile
@@ -59,11 +59,15 @@ libSoOFS_OBJC_FILES = \
        OFSFolderDataSource.m           \
 
 
+ifeq ($(frameworks),yes)
 # framework support
 
-SoOFS_HEADER_FILES = $(libSoOFS_HEADER_FILES)
-SoOFS_OBJC_FILES   = $(libSoOFS_OBJC_FILES)
+SoOFS_HEADER_FILES    = $(libSoOFS_HEADER_FILES)
+SoOFS_OBJC_FILES      = $(libSoOFS_OBJC_FILES) SoOFSProduct.m
+SoOFS_RESOURCE_FILES  = product.plist Version
+SoOFS_PRINCIPAL_CLASS = SoOFSProduct
 
+else
 
 # ----- SoCore product for SOPE core registrations
 
@@ -75,6 +79,8 @@ SoOFS_OBJC_FILES       = SoOFSProduct.m
 SoOFS_RESOURCE_FILES   = product.plist Version
 SoOFS_PRINCIPAL_CLASS  = SoOFSProduct
 
+endif
+
 
 # ----- NGObjWeb tools
 
@@ -88,10 +94,10 @@ $(SOPED_NAME)_OBJC_FILES = sope.m
 -include GNUmakefile.preamble
 ifneq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/library.make
+include $(GNUSTEP_MAKEFILES)/bundle.make
 else
 include $(GNUSTEP_MAKEFILES)/framework.make
 endif
-include $(GNUSTEP_MAKEFILES)/bundle.make
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
 -include fhs.make

diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble
index 857a7764f42b1ad9f62e18f22c1c54914c6ada88..f2c930b814eeba0bea0e4c8db540c4adb0e4eff8 100644 (file)
--- a/sope-appserver/SoOFS/GNUmakefile.preamble
+++ b/sope-appserver/SoOFS/GNUmakefile.preamble
@@ -16,6 +16,8 @@ ADDITIONAL_INCLUDE_DIRS += \
        -I$(SOPE_ROOT)/sope-xml
 
 
+ifneq ($(frameworks),yes)
+
 libSoOFS_LIBRARIES_DEPEND_UPON += \
        -lNGObjWeb \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
@@ -34,38 +36,48 @@ SoOFS_WOBUNDLE_LIBS += \
        -lXmlRpc -lDOM -lSaxObjC
 SoOFS_BUNDLE_LIBS   += $(SoOFS_WOBUNDLE_LIBS)
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/..
-RELBUILD_DIR_MIME=$(GNUSTEP_BUILD_DIR)/../../sope-mime
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/$(CORE_ROOT)
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
+else
+
+SoOFS_LIBRARIES_DEPEND_UPON += \
+       -framework NGObjWeb \
+       -framework NGMime       \
+       -framework NGStreams -framework NGExtensions -framework EOControl \
+       -framework XmlRpc -framework DOM -framework SaxObjC
 
-ADDITIONAL_LIB_DIRS += \
-       -L$(GNUSTEP_OBJ_DIR)                                            \
-       -L$(RELBUILD_DIR_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)         \
-       -L$(RELBUILD_DIR_MIME)/$(GNUSTEP_OBJ_DIR_NAME)                  \
-       -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME)      \
-       -L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME)   \
-       -L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME)      \
-       -L$(RELBUILD_DIR_SxXml)/XmlRpc/$(GNUSTEP_OBJ_DIR_NAME)          \
-       -L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME)             \
-       -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
+$(SOPED_NAME)_TOOL_LIBS += \
+       -framework SoOFS -framework NGObjWeb \
+       -framework NGMime \
+       -framework NGStreams -framework NGExtensions -framework EOControl \
+       -framework XmlRpc -framework DOM -framework SaxObjC
+
+endif
 
+
+# library/framework search pathes
+
+DEP_DIRS = \
+       . ../NGObjWeb \
+       $(SOPE_ROOT)/sope-mime                  \
+       $(SOPE_ROOT)/sope-core/NGStreams        \
+       $(SOPE_ROOT)/sope-core/NGExtensions     \
+       $(SOPE_ROOT)/sope-core/EOControl        \
+       $(SOPE_ROOT)/sope-xml/DOM               \
+       $(SOPE_ROOT)/sope-xml/XmlRpc            \
+       $(SOPE_ROOT)/sope-xml/SaxObjC
+
+ifneq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),\
+         -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
 else
 ADDITIONAL_LIB_DIRS += \
-       -L./$(GNUSTEP_OBJ_DIR)                                  \
-       -L../NGObjWeb/$(GNUSTEP_OBJ_DIR)                        \
-       -L$(SOPE_ROOT)/sope-mime/$(GNUSTEP_OBJ_DIR)             \
-       -L$(CORE_ROOT)/NGStreams/$(GNUSTEP_OBJ_DIR)             \
-       -L$(CORE_ROOT)/NGExtensions/$(GNUSTEP_OBJ_DIR)          \
-       -L$(CORE_ROOT)/EOControl/$(GNUSTEP_OBJ_DIR)             \
-       -L$(SOPE_ROOT)/sope-xml/XmlRpc/$(GNUSTEP_OBJ_DIR)       \
-       -L$(SOPE_ROOT)/sope-xml/DOM/$(GNUSTEP_OBJ_DIR)          \
-       -L$(SOPE_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
+
+
 # platform specific settings
 
 ifneq ($(findstring openbsd3, $(GNUSTEP_TARGET_OS)), openbsd3)

diff --git a/sope-appserver/WEExtensions/GNUmakefile b/sope-appserver/WEExtensions/GNUmakefile
index 26735c51f49a6d4a7886db8814f772d1f0ec1996..aff4a5d719aa8364818f058782b94078b703c6f8 100644 (file)
--- a/sope-appserver/WEExtensions/GNUmakefile
+++ b/sope-appserver/WEExtensions/GNUmakefile
@@ -5,16 +5,19 @@ include $(GNUSTEP_MAKEFILES)/common.make
 include ../Version
 include ./Version
 
+
 ifneq ($(frameworks),yes)
 LIBRARY_NAME   = libWEExtensions
+
+BUNDLE_NAME      = WEExtensions
+BUNDLE_EXTENSION = .wox
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
+
 else
 FRAMEWORK_NAME = WEExtensions
 endif
 
 
-BUNDLE_NAME      = WEExtensions
-BUNDLE_EXTENSION = .wox
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
 
 FHS_MANPAGES += doc/*.3
 
@@ -73,16 +76,21 @@ libWEExtensions_SUBPROJECTS += \
        WETableView
 
 
+ifeq ($(frameworks),yes)
 # framework support
 
 WEExtensions_HEADER_FILES = $(libWEExtensions_HEADER_FILES)
-WEExtensions_OBJC_FILES   = $(libWEExtensions_OBJC_FILES)
+WEExtensions_OBJC_FILES   = $(libWEExtensions_OBJC_FILES) WEExtensionsBundle.m
 WEExtensions_SUBPROJECTS  = $(libWEExtensions_SUBPROJECTS)
+WEExtensions_PRINCIPAL_CLASS = WEExtensionsBundle
+WEExtensions_RESOURCE_FILES  += bundle-info.plist Version *.api
 
+else
 # bundle
 
 WEExtensions_OBJC_FILES      = WEExtensionsBundle.m
 WEExtensions_PRINCIPAL_CLASS = WEExtensionsBundle
+endif
 
 
 # building

diff --git a/sope-appserver/WEExtensions/GNUmakefile.preamble b/sope-appserver/WEExtensions/GNUmakefile.preamble
index edfcf4f2b579bbd1c90648fe67837a01479fb490..06bbda2a79c47f483143945a1964b13938c71859 100644 (file)
--- a/sope-appserver/WEExtensions/GNUmakefile.preamble
+++ b/sope-appserver/WEExtensions/GNUmakefile.preamble
@@ -33,16 +33,19 @@ libWEExtensions_LIBRARIES_DEPEND_UPON += \
        -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 
+ifeq ($(frameworks),yes)
 WEExtensions_LIBRARIES_DEPEND_UPON += \
        -framework NGObjWeb     \
        -framework NGMime       \
        -framework NGStreams -framework NGExtensions -framework EOControl \
        -framework XmlRpc -framework DOM -framework SaxObjC
+endif
 
 
 # library/framework search pathes
 
 DEP_DIRS = \
+       ../NGObjWeb \
        $(SOPE_ROOT)/sope-mime                  \
        $(SOPE_ROOT)/sope-core/NGStreams        \
        $(SOPE_ROOT)/sope-core/NGExtensions     \
@@ -65,6 +68,8 @@ SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 # bundle dependencies
 
+ifneq ($(frameworks),yes)
+
 WEExtensions_BUNDLE_LIBS   += \
        -lWEExtensions  \
        -lNGObjWeb      \
@@ -78,6 +83,8 @@ WEExtensions_LIB_DIRS += -L$(GNUSTEP_OBJ_DIR)
 else
 WEExtensions_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR)
 endif
+endif
+
 
 # Apple
 

diff --git a/sope-appserver/WOExtensions/GNUmakefile b/sope-appserver/WOExtensions/GNUmakefile
index c5569816fb317e0e42b51a3c0c2fc0ddeeb5a33c..f4fa1791bda5b15c890a526fdcaec4a160024c2d 100644 (file)
--- a/sope-appserver/WOExtensions/GNUmakefile
+++ b/sope-appserver/WOExtensions/GNUmakefile
@@ -7,16 +7,15 @@ include ./Version
 
 ifneq ($(frameworks),yes)
 LIBRARY_NAME     = libWOExtensions
+BUNDLE_NAME      = WOExtensions
+BUNDLE_EXTENSION = .wox
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
+
 else
 FRAMEWORK_NAME = WOExtensions
 endif
 
 
-# TODO: can we save the .wox with frameworks?
-BUNDLE_NAME      = WOExtensions
-BUNDLE_EXTENSION = .wox
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
-
 FHS_MANPAGES += doc/*.3
 
 libWOExtensions_HEADER_FILES_DIR        = .
@@ -45,26 +44,35 @@ libWOExtensions_OBJC_FILES = \
        WORadioButtonMatrix.m           \
        WOCheckBoxMatrix.m              \
 
-WOExtensions_OBJC_FILES      += WOExtensionsBuilderModule.m
-WOExtensions_PRINCIPAL_CLASS = WOExtensionsBuilderModule
 
 
+ifeq ($(frameworks),yes)
 # framework support
 
-WOExtensions_HEADER_FILES_DIR = WOExtensions
 WOExtensions_HEADER_FILES = $(libWOExtensions_HEADER_FILES)
-WOExtensions_OBJC_FILES   = $(libWOExtensions_OBJC_FILES)
+
+WOExtensions_OBJC_FILES   = \
+       $(libWOExtensions_OBJC_FILES) \
+       WOExtensionsBuilderModule.m
+
 WOExtensions_SUBPROJECTS  = $(libWOExtensions_SUBPROJECTS)
+WOExtensions_PRINCIPAL_CLASS = WOExtensionsBuilderModule
+WOExtensions_RESOURCE_FILES  += bundle-info.plist Version *.api
 
+else
+# bundle
+WOExtensions_OBJC_FILES      += WOExtensionsBuilderModule.m
+WOExtensions_PRINCIPAL_CLASS = WOExtensionsBuilderModule
+endif
 
 # building
 
 -include GNUmakefile.preamble
 ifneq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/library.make
+include $(GNUSTEP_MAKEFILES)/bundle.make
 else
 include $(GNUSTEP_MAKEFILES)/framework.make
 endif
-include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
 -include fhs.make

diff --git a/sope-appserver/WOExtensions/GNUmakefile.preamble b/sope-appserver/WOExtensions/GNUmakefile.preamble
index 53c1f4c425e2e4777274502c6f946ccb263e38bd..a1802b22784e7057841fd5161275540e25339d24 100644 (file)
--- a/sope-appserver/WOExtensions/GNUmakefile.preamble
+++ b/sope-appserver/WOExtensions/GNUmakefile.preamble
@@ -1,5 +1,6 @@
 # compile flags
 
+SOPE_ROOT=../..
 
 ADDITIONAL_CPPFLAGS += -Wall
 ADDITIONAL_INCLUDE_DIRS += \
@@ -15,6 +16,8 @@ libWOExtensions_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 libWOExtensions_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
 
+# dependencies
+
 libWOExtensions_LIBRARIES_DEPEND_UPON += \
        -lWEExtensions  \
        -lNGObjWeb      \
@@ -22,38 +25,45 @@ libWOExtensions_LIBRARIES_DEPEND_UPON += \
        -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 
+ifeq ($(frameworks),yes)
+WOExtensions_LIBRARIES_DEPEND_UPON += \
+       -framework WEExtensions \
+       -framework NGObjWeb     \
+       -framework NGMime       \
+       -framework NGStreams -framework NGExtensions -framework EOControl \
+       -framework XmlRpc -framework DOM -framework SaxObjC
+endif
+
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_APPSERVER=$(GNUSTEP_BUILD_DIR)/..
-RELBUILD_DIR_MIME=$(GNUSTEP_BUILD_DIR)/../../sope-mime
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../sope-core
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
+# library/framework search pathes
 
+DEP_DIRS = \
+       ../WEExtensions \
+       ../NGObjWeb     \
+       $(SOPE_ROOT)/sope-mime                  \
+       $(SOPE_ROOT)/sope-core/NGStreams        \
+       $(SOPE_ROOT)/sope-core/NGExtensions     \
+       $(SOPE_ROOT)/sope-core/EOControl        \
+       $(SOPE_ROOT)/sope-xml/DOM               \
+       $(SOPE_ROOT)/sope-xml/XmlRpc            \
+       $(SOPE_ROOT)/sope-xml/SaxObjC
+
+ifneq ($(frameworks),yes)
 ADDITIONAL_LIB_DIRS += \
-       -L$(GNUSTEP_OBJ_DIR)                                            \
-        -L$(RELBUILD_DIR_APPSERVER)/WEExtensions/$(GNUSTEP_OBJ_DIR_NAME)\
-        -L$(RELBUILD_DIR_APPSERVER)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)   \
-        -L$(RELBUILD_DIR_MIME)/$(GNUSTEP_OBJ_DIR_NAME)                 \
-        -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME)      \
-        -L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME)   \
-        -L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME)             \
-        -L$(RELBUILD_DIR_SxXml)/XmlRpc/$(GNUSTEP_OBJ_DIR_NAME)         \
-        -L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME)            \
-        -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
+       $(foreach dir,$(DEP_DIRS),\
+         -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
 else
 ADDITIONAL_LIB_DIRS += \
-       -L./$(GNUSTEP_OBJ_DIR)                  \
-        -L../NGObjWeb/$(GNUSTEP_OBJ_DIR)        \
-        -L../WEExtensions/$(GNUSTEP_OBJ_DIR)   \
-        -L../../sope-mime/$(GNUSTEP_OBJ_DIR)                   \
-        -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR)         \
-        -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR)      \
-        -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)         \
-        -L../../sope-xml/XmlRpc/$(GNUSTEP_OBJ_DIR)             \
-        -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR)                        \
-        -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
+
+# bundle dependencies
+
+ifneq ($(frameworks),yes)
+
 WOExtensions_BUNDLE_LIBS += \
        -lWOExtensions -lWEExtensions \
        -lNGObjWeb      \
@@ -62,6 +72,9 @@ WOExtensions_BUNDLE_LIBS += \
        -lXmlRpc -lDOM -lSaxObjC
 WOExtensions_WOBUNDLE_LIBS += $(WOExtensions_BUNDLE_LIBS)
 
+endif
+
+
 # Apple
 
 ifeq ($(FOUNDATION_LIB),apple)

diff --git a/sope-appserver/WOXML/GNUmakefile b/sope-appserver/WOXML/GNUmakefile
index 7eb3f32bc92cb234e58834a8328ea8db70b5dedf..d56827f0d755ce6f80c87717a8dd11c5fa36565a 100644 (file)
--- a/sope-appserver/WOXML/GNUmakefile
+++ b/sope-appserver/WOXML/GNUmakefile
@@ -32,7 +32,6 @@ libWOXML_OBJC_FILES += \
 
 # framework support
 
-WOXML_HEADER_FILES_DIR = WOXML
 WOXML_HEADER_FILES = $(libWOXML_HEADER_FILES)
 WOXML_OBJC_FILES   = $(libWOXML_OBJC_FILES)
 WOXML_SUBPROJECTS  = $(libWOXML_SUBPROJECTS)

diff --git a/sope-appserver/WOXML/GNUmakefile.preamble b/sope-appserver/WOXML/GNUmakefile.preamble
index 0496bad90bf7a9d367e479d2219912825a99aca5..30f4ddfbb32fd9971a4262c9deb462d5bac94b3a 100644 (file)
--- a/sope-appserver/WOXML/GNUmakefile.preamble
+++ b/sope-appserver/WOXML/GNUmakefile.preamble
@@ -1,15 +1,36 @@
-# $Id$
+# compilation settings
+
+SOPE_ROOT=../..
 
 libWOXML_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 libWOXML_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
 libWOXML_INCLUDE_DIRS += -I. -I..
 
+
+# dependencies
+
 libWOXML_LIBRARIES_DEPEND_UPON += -lDOM -lSaxObjC
+WOXML_LIBRARIES_DEPEND_UPON += -framework DOM -framework SaxObjC
+
+
+# library/framework search pathes
 
+DEP_DIRS = \
+       $(SOPE_ROOT)/sope-xml/DOM               \
+       $(SOPE_ROOT)/sope-xml/SaxObjC
+
+ifneq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),\
+         -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
+else
 ADDITIONAL_LIB_DIRS += \
-       -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR) \
-       -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
+endif
+
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
 
 # Apple
 

diff --git a/sope-appserver/samples/CoreDataBlog/GNUmakefile.preamble b/sope-appserver/samples/CoreDataBlog/GNUmakefile.preamble
index d76595632a6a15fe9be2a3e975f526e8458c174b..71f815393bf06ad3a964711c994b6307d690b92b 100644 (file)
--- a/sope-appserver/samples/CoreDataBlog/GNUmakefile.preamble
+++ b/sope-appserver/samples/CoreDataBlog/GNUmakefile.preamble
@@ -1,5 +1,7 @@
 # compile settings
 
+SOPE_ROOT=../../..
+
 
 # CoreData files
 
@@ -12,13 +14,42 @@ $(WOAPP_NAME)_RESOURCE_FILES += \
 
 # static references required for Mach linker
 
-ADDITIONAL_LDFLAGS += \
+ADDITIONAL_TOOL_LIBS += \
        -framework CoreData     \
        -framework CoreServices
 
+ifneq ($(frameworks),yes)
 ADDITIONAL_TOOL_LIBS += \
        -lEOCoreData    \
        -lEOControl     \
        -lDOM -lXmlRpc -lSaxObjC
-
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+else
+ADDITIONAL_TOOL_LIBS += \
+       -framework EOCoreData   \
+       -framework EOControl    \
+       -framework XmlRpc -framework DOM -framework SaxObjC
+endif
+
+
+# library/framework search pathes
+
+DEP_DIRS = \
+       $(SOPE_ROOT)/sope-mime                  \
+       $(SOPE_ROOT)/sope-core/EOCoreData       \
+       $(SOPE_ROOT)/sope-core/NGStreams        \
+       $(SOPE_ROOT)/sope-core/NGExtensions     \
+       $(SOPE_ROOT)/sope-core/EOControl        \
+       $(SOPE_ROOT)/sope-xml/DOM               \
+       $(SOPE_ROOT)/sope-xml/XmlRpc            \
+       $(SOPE_ROOT)/sope-xml/SaxObjC
+
+ifneq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),\
+         -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
+else
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
+endif
+
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib