From 1c80a8d055151fbc1fd83683890387c9fcbef1b7 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 31 Aug 2004 14:15:56 +0000 Subject: [PATCH] fixed build with gstep-make 1.9.2 git-svn-id: http://svn.opengroupware.org/SOPE/trunk@94 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 5 ++++ sope-appserver/NGObjWeb/GNUmakefile.preamble | 4 +-- sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGXmlRpc/ChangeLog | 5 ++++ sope-appserver/NGXmlRpc/GNUmakefile.preamble | 10 +++++--- sope-appserver/NGXmlRpc/Version | 2 +- sope-appserver/SoOFS/ChangeLog | 5 ++++ sope-appserver/SoOFS/GNUmakefile.preamble | 3 ++- sope-appserver/SoOFS/Version | 2 +- sope-gdl1/GDLAccess/ChangeLog | 5 ++++ sope-gdl1/GDLAccess/GNUmakefile.preamble | 2 ++ sope-gdl1/GDLAccess/Version | 2 +- sope-ldap/samples/ChangeLog | 4 +++ sope-ldap/samples/GNUmakefile.preamble | 5 ++-- sope-mime/NGMime/ChangeLog | 6 +++++ sope-mime/NGMime/GNUmakefile | 1 + sope-mime/NGMime/GNUmakefile.preamble | 6 +++++ sope-mime/NGMime/NGMime.m | 4 +-- sope-mime/Version | 6 ++--- sope-xml/samples/ChangeLog | 4 +++ sope-xml/samples/GNUmakefile | 27 +------------------- sope-xml/samples/GNUmakefile.preamble | 26 +++++++++++++++++++ 22 files changed, 92 insertions(+), 44 deletions(-) create mode 100644 sope-xml/samples/GNUmakefile.preamble diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 6ee822d9..06c8aabc 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,8 @@ +2004-08-31 Helge Hess + + * GNUmakefile.preamble: fixed sope-mime library location for gstep-make + 1.9.2 (v.4.3.20) + 2004-08-29 Marcus Mueller * NGObjWeb.xcode: new Xcode project diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble index c9144011..7bcdb282 100644 --- 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 4bb06710..9b1f7ac0 100644 --- 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 da445e98..59bc289b 100644 --- a/sope-appserver/NGXmlRpc/ChangeLog +++ b/sope-appserver/NGXmlRpc/ChangeLog @@ -1,3 +1,8 @@ +2004-08-31 Helge Hess + + * GNUmakefile.preamble: fixed libNGMime location for gstep-make 1.9.2, + fixed library locations for FHS (v4.3.4) + 2004-08-29 Helge Hess * 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 e99ca66a..c31e4d5d 100644 --- 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 81d0f5a4..9d93031b 100644 --- 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 939592e9..e4550195 100644 --- a/sope-appserver/SoOFS/ChangeLog +++ b/sope-appserver/SoOFS/ChangeLog @@ -1,3 +1,8 @@ +2004-08-31 Helge Hess + + * GNUmakefile.preamble: fixed libNGMime location for gstep-make 1.9.2, + fixed library locations for FHS (v4.3.8) + 2004-08-29 Helge Hess * 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 8e23e91f..8b80ded6 100644 --- 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 e25d7408..46a90fec 100644 --- 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 b2c58b97..bae3a54f 100644 --- a/sope-gdl1/GDLAccess/ChangeLog +++ b/sope-gdl1/GDLAccess/ChangeLog @@ -1,3 +1,8 @@ +2004-08-31 Helge Hess + + * GNUmakefile.preamble: added library search pathes for FHS install + (v1.1.37) + 2004-08-30 Helge Hess * v1.1.36 diff --git a/sope-gdl1/GDLAccess/GNUmakefile.preamble b/sope-gdl1/GDLAccess/GNUmakefile.preamble index 145d1b8e..7ccacb31 100644 --- 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 90614ef6..bf873749 100644 --- 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 0e1b4e25..b36f1b98 100644 --- a/sope-ldap/samples/ChangeLog +++ b/sope-ldap/samples/ChangeLog @@ -1,3 +1,7 @@ +2004-08-31 Helge Hess + + * GNUmakefile.preamble: added library search pathes for FHS install + 2004-08-29 Helge Hess * 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 97276355..e9e55bc5 100644 --- 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 2bdefb57..75645368 100644 --- a/sope-mime/NGMime/ChangeLog +++ b/sope-mime/NGMime/ChangeLog @@ -1,3 +1,9 @@ +2004-08-31 Helge Hess + + * GNUmakefile: define library version (v4.3.176) + + * NGMime.m: use 4.3.0 as fallback library version + 2004-08-29 Marcus Mueller * NGMime.xcode: new Xcode project diff --git a/sope-mime/NGMime/GNUmakefile b/sope-mime/NGMime/GNUmakefile index 7e790429..9f63d0d4 100644 --- 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 6baeed73..1c626b38 100644 --- 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 bd97c4a4..78dc6cfe 100644 --- 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 769d66b9..7c3ed337 100644 --- 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 eaa97cfc..d31d8f20 100644 --- a/sope-xml/samples/ChangeLog +++ b/sope-xml/samples/ChangeLog @@ -1,3 +1,7 @@ +2004-08-31 Helge Hess + + * fixed linking for FHS configurations + 2004-08-29 Helge Hess * added hack to install the tools in FHS locations - the executables diff --git a/sope-xml/samples/GNUmakefile b/sope-xml/samples/GNUmakefile index 0165d9d2..e18cdea6 100644 --- 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 index 00000000..84b0930e --- /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 -- 2.39.2