fixed gcc 4.0 warnings

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

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index 7bcdb28263b96cbc4a774f0e70470ed3efbb3296..4ec44d0741c0c2c7b341492f327be67860aa3064 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble
@@ -1,6 +1,13 @@
-# $Id: GNUmakefile.preamble 25 2004-08-20 23:01:07Z helge $
+# compilation settings
 
-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
@@ -15,7 +22,6 @@ 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)/..
@@ -25,15 +31,14 @@ RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
 
 ADDITIONAL_LIB_DIRS += \
        -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/usr/local/lib -L/usr/lib
-
+       -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
 else
 libNGObjWeb_LIB_DIRS += \
        -L./$(GNUSTEP_OBJ_DIR)                  \
@@ -43,10 +48,11 @@ libNGObjWeb_LIB_DIRS += \
        -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)      \
-       -L/usr/local/lib -L/usr/lib
+       -L$(SOPE_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
 endif
 
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
 libNGObjWeb_LIBRARIES_DEPEND_UPON += \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC