X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sope-appserver%2FNGObjWeb%2FGNUmakefile.preamble;h=631196816e8cc459a9bf10fe8b47a9cb00af2d36;hb=a2987d1ae925a5e7145fd2aa8827d86c06b12ce9;hp=5832b6cec36660a42bf65320934215a8d9560874;hpb=b84c75da546fd8bb5f997d9e9a9bace284458f22;p=sope

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index 5832b6ce..63119681 100644
--- a/sope-appserver/NGObjWeb/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble
@@ -1,6 +1,19 @@
-# $Id: GNUmakefile.preamble 25 2004-08-20 23:01:07Z helge $
+# compilation settings
 
-ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1
+ifeq ($(frameworks),yes)
+ADDITIONAL_CPPFLAGS += -DCOMPILE_AS_FRAMEWORK=1
+endif
+
+SOPE_ROOT=../..
+
+ADDITIONAL_CPPFLAGS += \
+        -Wall -DCOMPILE_FOR_GSTEP_MAKE=1        \
+        -DSOPE_MAJOR_VERSION=$(MAJOR_VERSION)   \
+        -DSOPE_MINOR_VERSION=$(MINOR_VERSION)   \
+        -DSOPE_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
+
+ADDITIONAL_CPPFLAGS  += -pipe -DCOMPILING_NGOBJWEB=1
+libNGObjWeb_OBJCFLAGS += -Wall -Wno-import -Wno-protocol
 
 SOPE_ROOT=../..
 CORE_ROOT=$(SOPE_ROOT)/sope-core
@@ -15,49 +28,69 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-I$(CORE_ROOT)/NGExtensions	\
 	-I$(SOPE_ROOT)/sope-mime
 
-libNGObjWeb_OBJCFLAGS += -Wall -Wno-import -Wno-protocol
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SOPE=$(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 = \
+	$(SOPE_ROOT)/sope-mime/NGMail		\
+	$(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$(RELBUILD_DIR_SOPE)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME)	\
-	-L$(RELBUILD_DIR_MIME)/NGMime/$(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)		\
-	-L$(RELBUILD_DIR_JS)/$(GNUSTEP_OBJ_DIR_NAME)
+	$(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
+endif
+
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
 
+# dependencies
+
+ifneq ($(frameworks),yes)
+sope-xml-libs  = -lXmlRpc -lDOM -lSaxObjC
+sope-core-libs = -lNGStreams -lNGExtensions -lEOControl
+sope-mime-libs = -lNGMime
+sope-ngobjweb-libs = -lNGObjWeb
 else
-libNGObjWeb_LIB_DIRS += \
-	-L./$(GNUSTEP_OBJ_DIR)			\
-	-L../NGScripting/$(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)
+sope-xml-libs  = -framework XmlRpc -framework DOM -framework SaxObjC
+sope-core-libs = \
+  -framework NGStreams -framework NGExtensions -framework EOControl
+sope-mime-libs = -framework NGMime -framework NGMail
+sope-ngobjweb-libs = -framework NGObjWeb 
 endif
 
 libNGObjWeb_LIBRARIES_DEPEND_UPON += \
-	-lNGScripting					\
-	-lNGMime -lNGStreams -lNGExtensions -lEOControl	\
-	-lXmlRpc -lDOM -lSaxObjC
+	$(sope-mime-libs) \
+	$(sope-core-libs) \
+	$(sope-xml-libs)
+NGObjWeb_LIBRARIES_DEPEND_UPON += \
+	$(sope-mime-libs) \
+	$(sope-core-libs)\
+	$(sope-xml-libs)
+
+
+ADDITIONAL_LIB_DIRS  += $(libNGObjWeb_LIB_DIRS) -F.
 
-wod_LIB_DIRS  += $(libNGObjWeb_LIB_DIRS)
 wod_TOOL_LIBS += \
-	-lNGObjWeb -lNGScripting	\
-	-lNGMime -lNGStreams -lNGExtensions -lEOControl \
-	-lXmlRpc -lDOM -lSaxObjC
+	$(sope-ngobjweb-libs)	\
+	$(sope-mime-libs)	\
+	$(sope-core-libs)	\
+	$(sope-xml-libs)
+SoCore_BUNDLE_LIBS += \
+	$(sope-ngobjweb-libs)	\
+	$(sope-mime-libs)	\
+	$(sope-core-libs)	\
+	$(sope-xml-libs)
+
 
 # platform specific settings
 
@@ -74,6 +107,7 @@ endif
 ifeq ($(FOUNDATION_LIB),apple)
 libNGObjWeb_PREBIND_ADDR="0xC4900000"
 libNGObjWeb_LDFLAGS += -seg1addr $(libNGObjWeb_PREBIND_ADDR)
+NGObjWeb_LDFLAGS += -seg1addr $(libNGObjWeb_PREBIND_ADDR)
 endif
 
 ifeq ($(FOUNDATION_LIB),nx)
@@ -81,3 +115,7 @@ wod_TOOL_LIBS += -lDOM -lSaxObjC -lFoundationExt
 wod_LDFLAGS += -framework Foundation
 libNGObjWeb_LIBRARIES_DEPEND_UPON += -lFoundationExt
 endif
+
+ifeq ($(findstring openbsd3, $(GNUSTEP_TARGET_OS)), openbsd3)
+wod_TOOL_LIBS += -liconv
+endif