fixed makefiles to search FHS locations at the last resort

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

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index 15a872ebf2854cbfadaafd1d4499105de663bbb3..fa95f4f69dc1348b2f536abc5e49d904dfa108e9 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble
@@ -1,18 +1,27 @@
-# $Id$
+# $Id: GNUmakefile.preamble 25 2004-08-20 23:01:07Z helge $
 
-ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1
+ADDITIONAL_CPPFLAGS += \
+        -Wall -DCOMPILE_FOR_GSTEP_MAKE=1        \
+        -DSOPE_MAJOR_VERSION=$(MAJOR_VERSION)   \
+        -DSOPE_MINOR_VERSION=$(MINOR_VERSION)   \
+        -DSOPE_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
+
+libNGObjWeb_CPPFLAGS  += -pipe -DCOMPILING_NGOBJWEB=1
+libNGObjWeb_OBJCFLAGS += -Wall -Wno-import -Wno-protocol
+
+SOPE_ROOT=../..
+CORE_ROOT=$(SOPE_ROOT)/sope-core
 
 ADDITIONAL_INCLUDE_DIRS += \
        -I.                     \
        -I./DynamicElements/    \
        -I./Templates/          \
        -I..                    \
-       -I../../sope-core               \
-       -I../../sope-core/NGStreams/    \
-       -I../../sope-core/NGExtensions  \
-       -I../../sope-mime
+       -I$(CORE_ROOT)          \
+       -I$(CORE_ROOT)/NGStreams/       \
+       -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)/..
@@ -21,51 +30,36 @@ RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../sope-core
 RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
 
 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./$(GNUSTEP_OBJ_DIR)                                          \
+       -L$(GNUSTEP_BUILD_DIR)/$(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)         \
-       -L$(RELBUILD_DIR_JS)/$(GNUSTEP_OBJ_DIR_NAME)
-
+       -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
 else
 libNGObjWeb_LIB_DIRS += \
        -L./$(GNUSTEP_OBJ_DIR)                  \
-       -L../NGScripting/$(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)
+       -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)
 endif
 
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
 libNGObjWeb_LIBRARIES_DEPEND_UPON += \
-       -lNGScripting                                   \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 
 wod_LIB_DIRS  += $(libNGObjWeb_LIB_DIRS)
 wod_TOOL_LIBS += \
-       -lNGObjWeb -lNGScripting        \
-       -lNGMime -lNGStreams -lNGExtensions -lEOControl \
-       -lXmlRpc -lDOM -lSaxObjC
-
-xmlrpc_call_LIB_DIRS += $(libNGObjWeb_LIB_DIRS)
-sope_LIB_DIRS        += $(libNGObjWeb_LIB_DIRS)
-
-xmlrpc_call_TOOL_LIBS += \
-       -lNGObjWeb -lNGScripting        \
-       -lNGMime -lNGStreams -lNGExtensions -lEOControl \
-       -lXmlRpc -lDOM -lSaxObjC
-
-sope_TOOL_LIBS += \
-       -lNGObjWeb -lNGScripting        \
+       -lNGObjWeb \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 
@@ -76,7 +70,6 @@ ifneq ($(findstring openbsd3, $(GNUSTEP_TARGET_OS)), openbsd3)
 ifneq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
 # and neither does MacOSX? ...
 libNGObjWeb_LIBRARIES_DEPEND_UPON += -lcrypt
-sope_TOOL_LIBS += -lcrypt
 endif
 endif