From 3800d850d25a7461348b845a9263e087855c6ed3 Mon Sep 17 00:00:00 2001 From: znek Date: Sat, 11 Sep 2004 13:04:04 +0000 Subject: [PATCH] fixes for inline compilation using gs-make 1.10 and GNUSTEP_BUILD_DIR set to some arbitrary location git-svn-id: http://svn.opengroupware.org/SOPE/trunk@131 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 5 +++++ sope-appserver/NGObjWeb/GNUmakefile.preamble | 1 + sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGXmlRpc/ChangeLog | 5 +++++ sope-appserver/NGXmlRpc/GNUmakefile.preamble | 1 + sope-appserver/NGXmlRpc/Version | 2 +- sope-gdl1/GDLAccess/ChangeLog | 5 +++++ sope-gdl1/GDLAccess/FoundationExt/GNUmakefile | 2 +- sope-gdl1/GDLAccess/GNUmakefile.preamble | 9 +++++++++ sope-gdl1/GDLAccess/Version | 2 +- sope-gdl1/PostgreSQL/ChangeLog | 5 +++++ sope-gdl1/PostgreSQL/GNUmakefile.preamble | 14 +++++++++++++- sope-gdl1/PostgreSQL/Version | 2 +- sope-ical/iCalSaxDriver/ChangeLog | 5 +++++ sope-ical/iCalSaxDriver/GNUmakefile.preamble | 3 ++- sope-ical/iCalSaxDriver/Version | 2 +- sope-ldap/samples/ChangeLog | 5 +++++ sope-ldap/samples/GNUmakefile.preamble | 18 +++++++++++++++++- 18 files changed, 79 insertions(+), 9 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index d821cfb6..a04291ab 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,8 @@ +2004-09-11 Marcus Mueller + + * GNUmakefile.preamble: minor changes for inline compilation with + GNUSTEP_BUILD_DIR set elsewhere (v4.3.36) + 2004-09-11 Helge Hess * removed JavaScript function support (v4.3.35) diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble index 7bcdb282..5091249d 100644 --- a/sope-appserver/NGObjWeb/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble @@ -25,6 +25,7 @@ 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) \ diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 4cbc04b6..3e663142 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=35 +SUBMINOR_VERSION:=36 # 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 8448263b..c4bd7a54 100644 --- a/sope-appserver/NGXmlRpc/ChangeLog +++ b/sope-appserver/NGXmlRpc/ChangeLog @@ -1,3 +1,8 @@ +2004-09-11 Marcus Mueller + + * GNUmakefile.preamble: minor changes for inline compilation with + GNUSTEP_BUILD_DIR set elsewhere (v4.3.6) + 2004-09-10 Helge Hess * GNUmakefile: fixed soname, libname versions (v4.3.5) diff --git a/sope-appserver/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGXmlRpc/GNUmakefile.preamble index c31e4d5d..b7b303b1 100644 --- a/sope-appserver/NGXmlRpc/GNUmakefile.preamble +++ b/sope-appserver/NGXmlRpc/GNUmakefile.preamble @@ -34,6 +34,7 @@ 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_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME) \ -L$(RELBUILD_DIR_MIME)/$(GNUSTEP_OBJ_DIR_NAME) \ -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME) \ diff --git a/sope-appserver/NGXmlRpc/Version b/sope-appserver/NGXmlRpc/Version index d1646130..f3879a62 100644 --- a/sope-appserver/NGXmlRpc/Version +++ b/sope-appserver/NGXmlRpc/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=5 +SUBMINOR_VERSION:=6 diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog index 5c780556..a853945a 100644 --- a/sope-gdl1/GDLAccess/ChangeLog +++ b/sope-gdl1/GDLAccess/ChangeLog @@ -1,3 +1,8 @@ +2004-09-11 Marcus Mueller + + * GNUmakefile.preamble, FoundationExt/GNUmakefile: minor changes for + inline compilation with GNUSTEP_BUILD_DIR set elsewhere (v1.1.40) + 2004-09-06 Helge Hess * EOSQLQualifier.m: fixed a compile warning related to scanner handler diff --git a/sope-gdl1/GDLAccess/FoundationExt/GNUmakefile b/sope-gdl1/GDLAccess/FoundationExt/GNUmakefile index ca095b53..35201bf1 100644 --- a/sope-gdl1/GDLAccess/FoundationExt/GNUmakefile +++ b/sope-gdl1/GDLAccess/FoundationExt/GNUmakefile @@ -9,6 +9,6 @@ FoundationExt_OBJC_FILES = \ PrintfFormatScanner.m \ FormatScanner.m \ -ADDITIONAL_INCLUDE_DIRS += -I. -I.. +ADDITIONAL_INCLUDE_DIRS += -I. -I.. -I../../../sope-core/NGExtensions include $(GNUSTEP_MAKEFILES)/subproject.make diff --git a/sope-gdl1/GDLAccess/GNUmakefile.preamble b/sope-gdl1/GDLAccess/GNUmakefile.preamble index 7ccacb31..b6728038 100644 --- a/sope-gdl1/GDLAccess/GNUmakefile.preamble +++ b/sope-gdl1/GDLAccess/GNUmakefile.preamble @@ -11,8 +11,17 @@ ADDITIONAL_INCLUDE_DIRS += \ libGDLAccess_LIBRARIES_DEPEND_UPON += \ -lEOControl +ifneq ($(GNUSTEP_BUILD_DIR),) +RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/../.. +RELBUILD_DIR_Core=$(RELBUILD_DIR_SOPE)/sope-core + +ADDITIONAL_LIB_DIRS += \ + -L$(RELBUILD_DIR_Core)/EOControl/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_OBJ_DIR_NAME) +else ADDITIONAL_LIB_DIRS += \ -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) +endif ADDITIONAL_LIB_DIRS += \ -L/usr/local/lib -L/usr/lib diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version index 9ac699ea..3615e281 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:=39 +SUBMINOR_VERSION:=40 diff --git a/sope-gdl1/PostgreSQL/ChangeLog b/sope-gdl1/PostgreSQL/ChangeLog index 5bf6a9c4..35e67948 100644 --- a/sope-gdl1/PostgreSQL/ChangeLog +++ b/sope-gdl1/PostgreSQL/ChangeLog @@ -1,3 +1,8 @@ +2004-09-11 Marcus Mueller + + * GNUmakefile.preamble: minor changes for inline compilation with + GNUSTEP_BUILD_DIR set elsewhere (v1.1.38) + 2004-09-06 Helge Hess * EOAttribute+PostgreSQL72.m: use same exception handling on all diff --git a/sope-gdl1/PostgreSQL/GNUmakefile.preamble b/sope-gdl1/PostgreSQL/GNUmakefile.preamble index 2666f41f..609de918 100644 --- a/sope-gdl1/PostgreSQL/GNUmakefile.preamble +++ b/sope-gdl1/PostgreSQL/GNUmakefile.preamble @@ -38,7 +38,8 @@ ADDITIONAL_INCLUDE_DIRS += \ -I$(PGSQL)/include/pgsql \ -I$(PGSQL)/include \ -I.. -I../.. \ - -I../../sope-core/ + -I../../sope-core/ \ + -I../../sope-core/NGExtensions ADDITIONAL_INCLUDE_DIRS += \ -I/usr/local/include/pgsql \ @@ -48,9 +49,20 @@ ADDITIONAL_INCLUDE_DIRS += \ -I/usr/include/postgresql \ -I/usr/include \ +ifneq ($(GNUSTEP_BUILD_DIR),) +RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/../.. +RELBUILD_DIR_Core=$(RELBUILD_DIR_SOPE)/sope-core +RELBUILD_DIR_Gdl1=$(RELBUILD_DIR_SOPE)/sope-gdl1 + +ADDITIONAL_LIB_DIRS += \ + -L$(RELBUILD_DIR_Core)/EOControl/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_Gdl1)/GDLAccess/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_OBJ_DIR_NAME) +else ADDITIONAL_LIB_DIRS += \ -L../GDLAccess/$(GNUSTEP_OBJ_DIR)\ -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) +endif ifneq ($(PGSQL),) ADDITIONAL_LIB_DIRS += -L$(PGSQL)/lib diff --git a/sope-gdl1/PostgreSQL/Version b/sope-gdl1/PostgreSQL/Version index bf873749..7087ff32 100644 --- a/sope-gdl1/PostgreSQL/Version +++ b/sope-gdl1/PostgreSQL/Version @@ -1,3 +1,3 @@ # $Id: Version 1 2004-08-20 10:38:46Z znek $ -SUBMINOR_VERSION:=37 +SUBMINOR_VERSION:=38 diff --git a/sope-ical/iCalSaxDriver/ChangeLog b/sope-ical/iCalSaxDriver/ChangeLog index 1445915d..c5ced8f8 100644 --- a/sope-ical/iCalSaxDriver/ChangeLog +++ b/sope-ical/iCalSaxDriver/ChangeLog @@ -1,3 +1,8 @@ +2004-09-11 Marcus Mueller + + * GNUmakefile.preamble: minor changes for inline compilation with + GNUSTEP_BUILD_DIR set elsewhere (v4.3.14) + 2004-08-29 Helge Hess * added hack to install the project in FHS locations - the SAX driver diff --git a/sope-ical/iCalSaxDriver/GNUmakefile.preamble b/sope-ical/iCalSaxDriver/GNUmakefile.preamble index d495c33f..b6315772 100644 --- a/sope-ical/iCalSaxDriver/GNUmakefile.preamble +++ b/sope-ical/iCalSaxDriver/GNUmakefile.preamble @@ -1,8 +1,9 @@ # $Id$ +SOPE_ROOT=../.. ADDITIONAL_INCLUDE_DIRS += \ - -I../../sope-xml + -I$(SOPE_ROOT)/sope-xml -I$(SOPE_ROOT)/sope-core/NGExtensions BUNDLE_LIBS += -lSaxObjC -lical diff --git a/sope-ical/iCalSaxDriver/Version b/sope-ical/iCalSaxDriver/Version index 92c8fa08..cc039aca 100644 --- a/sope-ical/iCalSaxDriver/Version +++ b/sope-ical/iCalSaxDriver/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=13 +SUBMINOR_VERSION:=14 diff --git a/sope-ldap/samples/ChangeLog b/sope-ldap/samples/ChangeLog index b36f1b98..da895287 100644 --- a/sope-ldap/samples/ChangeLog +++ b/sope-ldap/samples/ChangeLog @@ -1,3 +1,8 @@ +2004-09-11 Marcus Mueller + + * GNUmakefile.preamble: minor changes for inline compilation with + GNUSTEP_BUILD_DIR set elsewhere. + 2004-08-31 Helge Hess * GNUmakefile.preamble: added library search pathes for FHS install diff --git a/sope-ldap/samples/GNUmakefile.preamble b/sope-ldap/samples/GNUmakefile.preamble index e9e55bc5..19685b49 100644 --- a/sope-ldap/samples/GNUmakefile.preamble +++ b/sope-ldap/samples/GNUmakefile.preamble @@ -7,13 +7,29 @@ ADDITIONAL_INCLUDE_DIRS += \ -I../../sope-core \ -I../../sope-xml \ +ifneq ($(GNUSTEP_BUILD_DIR),) +RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/../.. +RELBUILD_DIR_Core=$(RELBUILD_DIR_SOPE)/sope-core +RELBUILD_DIR_Xml=$(RELBUILD_DIR_SOPE)/sope-xml +RELBUILD_DIR_Ldap=$(RELBUILD_DIR_SOPE)/sope-ldap + +ADDITIONAL_LIB_DIRS += \ + -L$(RELBUILD_DIR_Core)/EOControl/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_Core)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_Core)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_Xml)/DOM/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_Xml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_Ldap)/NGLdap/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_OBJ_DIR_NAME) +else ADDITIONAL_LIB_DIRS += \ -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) \ -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR) \ -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR) \ -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR) \ -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR) \ - -L../NGLdap/$(GNUSTEP_OBJ_DIR) \ + -L../NGLdap/$(GNUSTEP_OBJ_DIR) +endif ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib -- 2.39.5