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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index d821cfb65f22fa697a4785942f0cd360bb329bf4..a04291ab625549c65ec2e4a5c6bf3243d031307f 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-11  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * GNUmakefile.preamble: minor changes for inline compilation with
+         GNUSTEP_BUILD_DIR set elsewhere (v4.3.36)
+
 2004-09-11  Helge Hess  <helge.hess@opengroupware.org>
 
        * removed JavaScript function support (v4.3.35)

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index 7bcdb28263b96cbc4a774f0e70470ed3efbb3296..5091249d55f3d265e8c0df4cfc2cd14f0436c2e6 100644 (file)
--- 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 4cbc04b62b8a8db5e79ee0114920c83958dce2bb..3e663142f3f301385df5c32f43f66c93a545107f 100644 (file)
--- 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 8448263b97aa9a423ad68aaf8feb67c9d58af144..c4bd7a54b16bf751970d67ade4add5a4332685fd 100644 (file)
--- a/sope-appserver/NGXmlRpc/ChangeLog
+++ b/sope-appserver/NGXmlRpc/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-11  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * GNUmakefile.preamble: minor changes for inline compilation with
+         GNUSTEP_BUILD_DIR set elsewhere (v4.3.6)
+
 2004-09-10  Helge Hess  <helge.hess@skyrix.com>
 
        * GNUmakefile: fixed soname, libname versions (v4.3.5)

diff --git a/sope-appserver/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGXmlRpc/GNUmakefile.preamble
index c31e4d5deaeebadc8f3b8835334a1b9675c9ff92..b7b303b1bfdaa9e3b0ea43437e2913c34f03c21c 100644 (file)
--- 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 d1646130b383b0ffd643ec15ead84ab41281eb5e..f3879a621640c27bcba29e6090db83d874417a83 100644 (file)
--- 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 5c780556c27feedceb69e2519d89b6330c30e155..a853945a4c2864a24903dddb5494f055caab8faf 100644 (file)
--- a/sope-gdl1/GDLAccess/ChangeLog
+++ b/sope-gdl1/GDLAccess/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-11  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * GNUmakefile.preamble, FoundationExt/GNUmakefile: minor changes for
+         inline compilation with GNUSTEP_BUILD_DIR set elsewhere (v1.1.40)
+
 2004-09-06  Helge Hess  <helge.hess@skyrix.com>
 
        * 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 ca095b53bce02fb74c472ca1acb85b92f607b67a..35201bf1d710e6c3a4ff1e732a07bf12cefb0c42 100644 (file)
--- 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 7ccacb31087e9ed21d17ac40e7c1b9cb62af7597..b6728038b2c8444247cdd5ccce9c380d90d99619 100644 (file)
--- 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 9ac699ea80a6e6616dc06f80f8d36efe921d010e..3615e2814a319627751a3d5acdf8b9698122e03f 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:=39
+SUBMINOR_VERSION:=40

diff --git a/sope-gdl1/PostgreSQL/ChangeLog b/sope-gdl1/PostgreSQL/ChangeLog
index 5bf6a9c405fcbdbc3fb5dfa90c8f88d11b5693ab..35e679484efa0f577c01c8d8b5cabc35bf7b8f7f 100644 (file)
--- a/sope-gdl1/PostgreSQL/ChangeLog
+++ b/sope-gdl1/PostgreSQL/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-11  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * GNUmakefile.preamble: minor changes for inline compilation with
+         GNUSTEP_BUILD_DIR set elsewhere (v1.1.38)
+
 2004-09-06  Helge Hess  <helge.hess@opengroupware.org>
 
        * EOAttribute+PostgreSQL72.m: use same exception handling on all

diff --git a/sope-gdl1/PostgreSQL/GNUmakefile.preamble b/sope-gdl1/PostgreSQL/GNUmakefile.preamble
index 2666f41f2edc38b71d02887c1b3bf9da0ad378c3..609de9182d93661ad0ce2b7024aee59c41fb0ce8 100644 (file)
--- 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 bf873749e63714019fbda48fd1eadd96f7e5fcd1..7087ff32410f53681d82e1380c7ec57332dea764 100644 (file)
--- 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 1445915d8f266847dbe29fb336927806ffe51401..c5ced8f81c7e5259ab4b7ceab9bd963ad5003fb4 100644 (file)
--- a/sope-ical/iCalSaxDriver/ChangeLog
+++ b/sope-ical/iCalSaxDriver/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-11  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * GNUmakefile.preamble: minor changes for inline compilation with
+         GNUSTEP_BUILD_DIR set elsewhere (v4.3.14)
+
 2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
        
        * 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 d495c33f330c5f460ea2572f5178822957d66708..b6315772048235c3c0f7ebcaf218d5ebffe56e9a 100644 (file)
--- 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 92c8fa08c38f073a34665a077f87e34ece0ab9e3..cc039aca8fe720e89b35bf8bb715cdccb043159e 100644 (file)
--- 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 b36f1b98a7cb61368cbf33ce7efaca407cb0fac1..da895287ea4dc7d3c8aa3fae070ffe5366d11f8a 100644 (file)
--- a/sope-ldap/samples/ChangeLog
+++ b/sope-ldap/samples/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-11  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * GNUmakefile.preamble: minor changes for inline compilation with
+         GNUSTEP_BUILD_DIR set elsewhere.
+
 2004-08-31  Helge Hess  <helge.hess@skyrix.com>
 
        * GNUmakefile.preamble: added library search pathes for FHS install

diff --git a/sope-ldap/samples/GNUmakefile.preamble b/sope-ldap/samples/GNUmakefile.preamble
index e9e55bc582936d1a40924563cfafc67478c91eaa..19685b49bc00f60a2030d128fbd0e1b11aa6031e 100644 (file)
--- 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