X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=sope-appserver%2FNGXmlRpc%2FGNUmakefile.preamble;h=a45cebd8a9d141ef41a2f0d597b7ea1a813fad82;hb=a2987d1ae925a5e7145fd2aa8827d86c06b12ce9;hp=7fd90095d0e54b895828bea3055237daf71be904;hpb=f57ae3d81a455392d1ed353ee60dac2ddef463ea;p=sope

diff --git a/sope-appserver/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGXmlRpc/GNUmakefile.preamble
index 7fd90095..a45cebd8 100644
--- a/sope-appserver/NGXmlRpc/GNUmakefile.preamble
+++ b/sope-appserver/NGXmlRpc/GNUmakefile.preamble
@@ -3,10 +3,6 @@
 SOPE_ROOT=../..
 CORE_ROOT=$(SOPE_ROOT)/sope-core
 
-ifeq ($(FOUNDATION_LIB),apple)
-NGXmlRpc_INSTALL_DIR = /Library/Frameworks/
-endif
-
 ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1
 ADDITIONAL_OBJCFLAGS += -Wall -Wno-import -Wno-protocol
 
@@ -20,40 +16,42 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-I$(CORE_ROOT)/NGExtensions	\
 	-I$(SOPE_ROOT)/sope-xml
 
+
+# dependencies
+
 libNGXmlRpc_LIBRARIES_DEPEND_UPON += \
 	-lNGObjWeb \
 	-lNGMime -lNGStreams -lNGExtensions -lEOControl	\
 	-lXmlRpc -lDOM -lSaxObjC
 
-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
+NGXmlRpc_LIBRARIES_DEPEND_UPON += \
+	-framework NGObjWeb \
+	-framework NGMime \
+	-framework NGMail \
+	-framework NGStreams -framework NGExtensions -framework EOControl \
+	-framework XmlRpc -framework DOM -framework SaxObjC
 
-ADDITIONAL_LIB_DIRS += \
-	-L./$(GNUSTEP_OBJ_DIR)						\
-	-L$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_OBJ_DIR_NAME)			\
-	-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)
 
+# library/framework search pathes
+
+DEP_DIRS = \
+	../NGObjWeb \
+	$(SOPE_ROOT)/sope-mime			\
+	$(SOPE_ROOT)/sope-mime/NGMail		\
+	$(SOPE_ROOT)/sope-core/NGStreams	\
+	$(SOPE_ROOT)/sope-core/NGExtensions	\
+	$(SOPE_ROOT)/sope-core/EOControl	\
+	$(SOPE_ROOT)/sope-xml/XmlRpc		\
+	$(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./$(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