X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sope-appserver%2FSoOFS%2FGNUmakefile.preamble;h=6a8f81629e1821309bb83595b51aba6d989143cc;hb=17be2c0fbd946936e3232ad767c3f3b0d4e1470e;hp=8b80ded6aa46d431e12ea9b04bcb9e3cb41593a7;hpb=1c80a8d055151fbc1fd83683890387c9fcbef1b7;p=sope

diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble
index 8b80ded6..6a8f8162 100644
--- a/sope-appserver/SoOFS/GNUmakefile.preamble
+++ b/sope-appserver/SoOFS/GNUmakefile.preamble
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile.preamble 14 2004-08-20 21:07:18Z helge $
+# compilation settings
 
 ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1
 ADDITIONAL_OBJCFLAGS += -Wall -Wno-import -Wno-protocol
@@ -6,62 +6,81 @@ 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..			\
 	-I../NGObjWeb		\
-	-I../NGObjWeb/SoObjects	\
-	-I../NGObjWeb/WebDAV	\
 	-I$(CORE_ROOT)		\
 	-I$(CORE_ROOT)/NGStreams/	\
 	-I$(CORE_ROOT)/NGExtensions	\
 	-I$(SOPE_ROOT)/sope-xml
 
 
+ifneq ($(frameworks),yes)
+
 libSoOFS_LIBRARIES_DEPEND_UPON += \
 	-lNGObjWeb \
 	-lNGMime -lNGStreams -lNGExtensions -lEOControl	\
 	-lXmlRpc -lDOM -lSaxObjC
 
-sope_TOOL_LIBS += \
+$(SOPED_NAME)_TOOL_LIBS += \
 	-lSoOFS -lNGObjWeb \
 	-lNGMime -lNGStreams -lNGExtensions -lEOControl \
 	-lXmlRpc -lDOM -lSaxObjC
 
-SoOFS_WOBUNDLE_LIBS += -lSoOFS
+SoOFS_WOBUNDLE_LIBS += \
+	-lSoOFS		\
+	-lNGObjWeb	\
+	-lNGMime	\
+	-lNGStreams -lNGExtensions -lEOControl \
+	-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
 
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
+
 
 # platform specific settings
 
@@ -72,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