fixed install locations on OSX

[sope] / sope-appserver / SoOFS / GNUmakefile.preamble

diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble
index 6184c0a261e8f073856da487d7069a70396e4fbc..6a8f81629e1821309bb83595b51aba6d989143cc 100644 (file)
--- a/sope-appserver/SoOFS/GNUmakefile.preamble
+++ b/sope-appserver/SoOFS/GNUmakefile.preamble
@@ -6,6 +6,10 @@ ADDITIONAL_OBJCFLAGS += -Wall -Wno-import -Wno-protocol
 SOPE_ROOT=../..
 CORE_ROOT=$(SOPE_ROOT)/sope-core
 
+ifeq ($(FOUNDATION_LIB),apple)
+SoOFS_INSTALL_DIR = /Library/Frameworks/
+endif
+
 ADDITIONAL_INCLUDE_DIRS += \
        -I.                     \
        -I..                    \
@@ -16,6 +20,8 @@ ADDITIONAL_INCLUDE_DIRS += \
        -I$(SOPE_ROOT)/sope-xml
 
 
+ifneq ($(frameworks),yes)
+
 libSoOFS_LIBRARIES_DEPEND_UPON += \
        -lNGObjWeb \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
@@ -34,38 +40,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
 
-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)
+SoOFS_LIBRARIES_DEPEND_UPON += \
+       -framework NGObjWeb \
+       -framework NGMime       \
+       -framework NGStreams -framework NGExtensions -framework EOControl \
+       -framework XmlRpc -framework DOM -framework SaxObjC
+
+$(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)
@@ -75,3 +91,7 @@ ifneq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
 sope_TOOL_LIBS += -lcrypt
 endif
 endif
+
+ifeq ($(findstring openbsd3, $(GNUSTEP_TARGET_OS)), openbsd3)
+$(SOPED_NAME)_TOOL_LIBS += -liconv
+endif