fixed build with gstep-make 1.9.2

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@94 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 6ee822d9235f4f9b8af2f12f3ae3240b8a8e5611..06c8aabc3d7d811aee5f599547f9a79d13f7c088 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-31  Helge Hess  <helge.hess@skyrix.com>
+
+       * GNUmakefile.preamble: fixed sope-mime library location for gstep-make
+         1.9.2 (v.4.3.20)
+
 2004-08-29  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * NGObjWeb.xcode: new Xcode project

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index c9144011b027fd75c8e5da60e2bce557d7a21e2f..7bcdb28263b96cbc4a774f0e70470ed3efbb3296 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble
@@ -24,8 +24,8 @@ 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_MIME)/NGMime/$(GNUSTEP_OBJ_DIR_NAME)           \
+       -L./$(GNUSTEP_OBJ_DIR)                                          \
+       -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)      \

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 4bb067103c9c4049951be952259972009dd1242d..9b1f7ac0e30b9dcff4bb2884b47997647c0dccbb 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=19
+SUBMINOR_VERSION:=20
 
 # v4.2.413 requires libSaxObjC      v4.2.33
 # v4.2.341 requires libNGExtensions v4.2.77

diff --git a/sope-appserver/NGXmlRpc/ChangeLog b/sope-appserver/NGXmlRpc/ChangeLog
index da445e9883090e352945994cc40c323ab33eff21..59bc289b1d5052e5ccd2fc14c5e486e7000fcccb 100644 (file)
--- a/sope-appserver/NGXmlRpc/ChangeLog
+++ b/sope-appserver/NGXmlRpc/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-31  Helge Hess  <helge.hess@skyrix.com>
+
+       * GNUmakefile.preamble: fixed libNGMime location for gstep-make 1.9.2,
+         fixed library locations for FHS (v4.3.4)
+
 2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
 
        * added hack to install the project in FHS locations - the library,

diff --git a/sope-appserver/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGXmlRpc/GNUmakefile.preamble
index e99ca66af0b5cda7a4d8fc9c886f6f2b74eae4e3..c31e4d5deaeebadc8f3b8835334a1b9675c9ff92 100644 (file)
--- a/sope-appserver/NGXmlRpc/GNUmakefile.preamble
+++ b/sope-appserver/NGXmlRpc/GNUmakefile.preamble
@@ -9,8 +9,8 @@ ADDITIONAL_OBJCFLAGS += -Wall -Wno-import -Wno-protocol
 ADDITIONAL_CPPFLAGS += -pipe -Wall
 ADDITIONAL_CPPFLAGS += -DCOMPILING_NGOBJWEB=1
 
-libNGXmlRpc_INCLUDE_DIRS += \
-       -I.. -I. -I../..                \
+ADDITIONAL_INCLUDE_DIRS += \
+       -I.. -I. -I../.. -I../NGObjWeb/ \
        -I$(CORE_ROOT)                  \
        -I$(CORE_ROOT)/NGStreams        \
        -I$(CORE_ROOT)/NGExtensions     \
@@ -33,9 +33,9 @@ RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/$(CORE_ROOT)
 RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
 
 ADDITIONAL_LIB_DIRS += \
-       -L$(GNUSTEP_OBJ_DIR)                                            \
+       -L./$(GNUSTEP_OBJ_DIR)                                          \
        -L$(RELBUILD_DIR_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)         \
-       -L$(RELBUILD_DIR_MIME)/NGMime/$(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)      \
@@ -55,3 +55,5 @@ ADDITIONAL_LIB_DIRS += \
        -L$(SOPE_ROOT)/sope-xml/DOM/$(GNUSTEP_OBJ_DIR)          \
        -L$(SOPE_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
 endif
+
+ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib

diff --git a/sope-appserver/NGXmlRpc/Version b/sope-appserver/NGXmlRpc/Version
index 81d0f5a4cff3edc3be75e404954d4eed90c1bd38..9d93031b2c14602d3af70ada8fe43b6eda356ce9 100644 (file)
--- a/sope-appserver/NGXmlRpc/Version
+++ b/sope-appserver/NGXmlRpc/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=3
+SUBMINOR_VERSION:=4

diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog
index 939592e93da0da26dfc908a67575233c8faf5115..e455019502b392b20a41937158268b3c32367980 100644 (file)
--- a/sope-appserver/SoOFS/ChangeLog
+++ b/sope-appserver/SoOFS/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-31  Helge Hess  <helge.hess@skyrix.com>
+
+       * GNUmakefile.preamble: fixed libNGMime location for gstep-make 1.9.2,
+         fixed library locations for FHS (v4.3.8)
+
 2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
 
        * added hack to install the project in FHS locations - the library,

diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble
index 8e23e91fd9bbc86130016609dd1b0ed035a1f12b..8b80ded6aa46d431e12ea9b04bcb9e3cb41593a7 100644 (file)
--- a/sope-appserver/SoOFS/GNUmakefile.preamble
+++ b/sope-appserver/SoOFS/GNUmakefile.preamble
@@ -40,7 +40,7 @@ RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
 ADDITIONAL_LIB_DIRS += \
        -L$(GNUSTEP_OBJ_DIR)                                            \
        -L$(RELBUILD_DIR_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)         \
-       -L$(RELBUILD_DIR_MIME)/NGMime/$(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)      \
@@ -61,6 +61,7 @@ ADDITIONAL_LIB_DIRS += \
        -L$(SOPE_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
 endif
 
+ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
 
 # platform specific settings
 

diff --git a/sope-appserver/SoOFS/Version b/sope-appserver/SoOFS/Version
index e25d74084dc4c2e2906959e41a066ffe108ef7ca..46a90fece8d9225fe5e08bb0a71cc5146b9dcdf2 100644 (file)
--- a/sope-appserver/SoOFS/Version
+++ b/sope-appserver/SoOFS/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=7
+SUBMINOR_VERSION:=8

diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog
index b2c58b97e28330e4a219af684f0ba2177f546317..bae3a54f81f48e43bbacf25893e26b7681a726f8 100644 (file)
--- a/sope-gdl1/GDLAccess/ChangeLog
+++ b/sope-gdl1/GDLAccess/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-31  Helge Hess  <helge.hess@skyrix.com>
+
+       * GNUmakefile.preamble: added library search pathes for FHS install
+         (v1.1.37)
+
 2004-08-30  Helge Hess  <helge.hess@opengroupware.org>
 
        * v1.1.36

diff --git a/sope-gdl1/GDLAccess/GNUmakefile.preamble b/sope-gdl1/GDLAccess/GNUmakefile.preamble
index 145d1b8e15b3d854b72757b845cc1f3459f2e292..7ccacb31087e9ed21d17ac40e7c1b9cb62af7597 100644 (file)
--- a/sope-gdl1/GDLAccess/GNUmakefile.preamble
+++ b/sope-gdl1/GDLAccess/GNUmakefile.preamble
@@ -14,3 +14,5 @@ libGDLAccess_LIBRARIES_DEPEND_UPON += \
 ADDITIONAL_LIB_DIRS += \
        -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)
 
+ADDITIONAL_LIB_DIRS += \
+        -L/usr/local/lib -L/usr/lib

diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version
index 90614ef6c54d1c76ba894e58a0c106ba5df8ee04..bf873749e63714019fbda48fd1eadd96f7e5fcd1 100644 (file)
--- a/sope-gdl1/GDLAccess/Version
+++ b/sope-gdl1/GDLAccess/Version
@@ -1,3 +1,3 @@
 # $Id: Version 1 2004-08-20 10:38:46Z znek $
 
-SUBMINOR_VERSION:=36
+SUBMINOR_VERSION:=37

diff --git a/sope-ldap/samples/ChangeLog b/sope-ldap/samples/ChangeLog
index 0e1b4e25597b25e9d4d211c53589d6c75b483d55..b36f1b98a7cb61368cbf33ce7efaca407cb0fac1 100644 (file)
--- a/sope-ldap/samples/ChangeLog
+++ b/sope-ldap/samples/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-31  Helge Hess  <helge.hess@skyrix.com>
+
+       * GNUmakefile.preamble: added library search pathes for FHS install
+
 2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
 
        * added hack to install the tools in FHS locations - the executables

diff --git a/sope-ldap/samples/GNUmakefile.preamble b/sope-ldap/samples/GNUmakefile.preamble
index 97276355256e1756e62a0e2a69efee08eb093bc9..e9e55bc582936d1a40924563cfafc67478c91eaa 100644 (file)
--- a/sope-ldap/samples/GNUmakefile.preamble
+++ b/sope-ldap/samples/GNUmakefile.preamble
@@ -1,4 +1,4 @@
-# $Id$
+# compilation settings
 
 ADDITIONAL_INCLUDE_DIRS += \
        -I..                            \
@@ -15,7 +15,8 @@ ADDITIONAL_LIB_DIRS += \
        -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)             \
        -L../NGLdap/$(GNUSTEP_OBJ_DIR)       \
 
+ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+
 ADDITIONAL_TOOL_LIBS += \
        -lNGStreams -lNGExtensions -lEOControl  \
        -lDOM -lSaxObjC
-

diff --git a/sope-mime/NGMime/ChangeLog b/sope-mime/NGMime/ChangeLog
index 2bdefb5795b8eab404ab8f16d27bfdcbb5ebf874..7564536832b7745971f08233f990016d0a9e4976 100644 (file)
--- a/sope-mime/NGMime/ChangeLog
+++ b/sope-mime/NGMime/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-31  Helge Hess  <helge.hess@skyrix.com>
+
+       * GNUmakefile: define library version (v4.3.176)
+
+       * NGMime.m: use 4.3.0 as fallback library version
+
 2004-08-29  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * NGMime.xcode: new Xcode project

diff --git a/sope-mime/NGMime/GNUmakefile b/sope-mime/NGMime/GNUmakefile
index 7e790429292765d3a6346c8c4914b384e84356aa..9f63d0d4e7ff369325dd9bd1a044bcdd441c5e9b 100644 (file)
--- a/sope-mime/NGMime/GNUmakefile
+++ b/sope-mime/NGMime/GNUmakefile
@@ -1,6 +1,7 @@
 # $Id: GNUmakefile 9 2004-08-20 18:40:42Z helge $
 
 include $(GNUSTEP_MAKEFILES)/common.make
+include ../Version
 
 SUBPROJECT_NAME = NGMime
 

diff --git a/sope-mime/NGMime/GNUmakefile.preamble b/sope-mime/NGMime/GNUmakefile.preamble
index 6baeed73f808bbfe06d3f89dfa334ae67a661df9..1c626b383aaf27d25993ffcb7ed3154f24b79e05 100644 (file)
--- a/sope-mime/NGMime/GNUmakefile.preamble
+++ b/sope-mime/NGMime/GNUmakefile.preamble
@@ -1,3 +1,9 @@
+# compilation settings
+
+ADDITIONAL_CPPFLAGS += -DLIBRARY_MAJOR_VERSION=${MAJOR_VERSION} \
+                      -DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
+                      -DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION} \
+
 NGMime_INCLUDE_DIRS += \
        -I.. -I../..                    \
        -I../../sope-core/NGStreams/    \

diff --git a/sope-mime/NGMime/NGMime.m b/sope-mime/NGMime/NGMime.m
index bd97c4a4ef09980358ea6dcede78f65e5160c3ae..78dc6cfeb73415497ed4528b0c15391840d52680 100644 (file)
--- a/sope-mime/NGMime/NGMime.m
+++ b/sope-mime/NGMime/NGMime.m
@@ -24,12 +24,12 @@
 
 #ifndef LIBRARY_MAJOR_VERSION
 #  if !COCOA_Foundation_LIBRARY && !NeXT_Foundation_LIBRARY
-#    warning library version not passed in as a default (using 4.2.0)
+#    warning library version not passed in as a default (using 4.3.0)
 #  endif
 #  define LIBRARY_MAJOR_VERSION 4
 #endif
 #ifndef LIBRARY_MINOR_VERSION
-#  define LIBRARY_MINOR_VERSION 2
+#  define LIBRARY_MINOR_VERSION 3
 #endif
 #ifndef LIBRARY_SUBMINOR_VERSION
 #  define LIBRARY_SUBMINOR_VERSION 0

diff --git a/sope-mime/Version b/sope-mime/Version
index 769d66b9b2213b719480dfb01dc367d4bf0de485..7c3ed33761e542bab0c3103c387c4183f6a8e4de 100644 (file)
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -1,7 +1,7 @@
 # $Id$
 
-MAJOR_VERSION=4
-MINOR_VERSION=3
-SUBMINOR_VERSION:=175
+MAJOR_VERSION:=4
+MINOR_VERSION:=3
+SUBMINOR_VERSION:=176
 
 # v4.2.149 requires libNGStreams v4.2.34

diff --git a/sope-xml/samples/ChangeLog b/sope-xml/samples/ChangeLog
index eaa97cfc525e29e1b362d786ede09696d67a5d8f..d31d8f2072c40743a03d9a3d9d851c13caa52f16 100644 (file)
--- a/sope-xml/samples/ChangeLog
+++ b/sope-xml/samples/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-31  Helge Hess  <helge.hess@skyrix.com>
+
+       * fixed linking for FHS configurations
+
 2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
 
        * added hack to install the tools in FHS locations - the executables

diff --git a/sope-xml/samples/GNUmakefile b/sope-xml/samples/GNUmakefile
index 0165d9d2633ba0e7e6eb0e5ccf9cbc8ebd7e22b2..e18cdea6e3c644ca6f8f6d93847ff26b465400c1 100644 (file)
--- a/sope-xml/samples/GNUmakefile
+++ b/sope-xml/samples/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $
+# GNUstep makefile
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
@@ -19,31 +19,6 @@ xmln_OBJC_FILES       = xmln.m
 domxml_OBJC_FILES     = domxml.m
 testqp_OBJC_FILES     = testqp.m
 
-domxml_TOOL_LIBS  += -lDOM -lSaxObjC
-
-testqp_TOOL_LIBS  += -lDOM -lSaxObjC
-
-ADDITIONAL_CPPFLAGS  += -Wno-protocol
-ADDITIONAL_TOOL_LIBS += -lSaxObjC
-
-# only with libFoundation
-#ADDITIONAL_TOOL_LIBS += -lEOControl
-
-ADDITIONAL_INCLUDE_DIRS += -I..
-
-ifneq ($(GNUSTEP_BUILD_DIR),)
-ADDITIONAL_LIB_DIRS += \
-       -L$(GNUSTEP_BUILD_DIR)/../DOM/$(GNUSTEP_OBJ_DIR_NAME)           \
-       -L$(GNUSTEP_BUILD_DIR)/../SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)       \
-       -L$(GNUSTEP_BUILD_DIR)/../XmlRpc/$(GNUSTEP_OBJ_DIR_NAME)
-else
-ADDITIONAL_LIB_DIRS += \
-       -L../DOM/$(GNUSTEP_OBJ_DIR)     \
-       -L../SaxObjC/$(GNUSTEP_OBJ_DIR) \
-       -L../XmlRpc/$(GNUSTEP_OBJ_DIR)
-endif
-
-
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble

diff --git a/sope-xml/samples/GNUmakefile.preamble b/sope-xml/samples/GNUmakefile.preamble
new file mode 100644 (file)
index 0000000..84b0930
--- /dev/null
+++ b/sope-xml/samples/GNUmakefile.preamble
@@ -0,0 +1,26 @@
+# compilation settings
+
+domxml_TOOL_LIBS  += -lDOM -lSaxObjC
+testqp_TOOL_LIBS  += -lDOM -lSaxObjC
+
+ADDITIONAL_CPPFLAGS  += -Wno-protocol
+ADDITIONAL_TOOL_LIBS += -lSaxObjC
+
+# only with libFoundation
+#ADDITIONAL_TOOL_LIBS += -lEOControl
+
+ADDITIONAL_INCLUDE_DIRS += -I..
+
+ifneq ($(GNUSTEP_BUILD_DIR),)
+ADDITIONAL_LIB_DIRS += \
+       -L$(GNUSTEP_BUILD_DIR)/../DOM/$(GNUSTEP_OBJ_DIR_NAME)           \
+       -L$(GNUSTEP_BUILD_DIR)/../SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)       \
+       -L$(GNUSTEP_BUILD_DIR)/../XmlRpc/$(GNUSTEP_OBJ_DIR_NAME)
+else
+ADDITIONAL_LIB_DIRS += \
+       -L../DOM/$(GNUSTEP_OBJ_DIR)     \
+       -L../SaxObjC/$(GNUSTEP_OBJ_DIR) \
+       -L../XmlRpc/$(GNUSTEP_OBJ_DIR)
+endif
+
+ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib