fixed inline compilation

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

diff --git a/sope-gdl1/SQLite3/ChangeLog b/sope-gdl1/SQLite3/ChangeLog
index 82d728b84b8873359dbad4926278fa3b4f2be4c5..181d2ebbd8868ac4daf17b2c08512652a89c0c6d 100644 (file)
--- a/sope-gdl1/SQLite3/ChangeLog
+++ b/sope-gdl1/SQLite3/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-08  Helge Hess  <helge@shire.in.skyrix.com>
+
+       * GNUmakefile.preamble: fixed pathes for inline-compilation (v4.5.19)
+
 2005-07-27  Helge Hess  <helge.hess@skyrix.com>
 
        * fixed gcc 4.0 warnings (char signedness) (v4.5.18)

diff --git a/sope-gdl1/SQLite3/GNUmakefile.preamble b/sope-gdl1/SQLite3/GNUmakefile.preamble
index d700c159e574988d318ea86488485ff819535700..e2618dfef6f346154015f5abb7d778a3e0c9d06f 100644 (file)
--- a/sope-gdl1/SQLite3/GNUmakefile.preamble
+++ b/sope-gdl1/SQLite3/GNUmakefile.preamble
@@ -34,12 +34,28 @@ gdltest_TOOL_LIBS += \
 # set compile flags and go
 
 ADDITIONAL_INCLUDE_DIRS += \
-       -I.. -I../..            \
-       -I/usr/local/include            \
-       -I/usr/include                  \
+       -I../GDLAccess -I..
 
+ADDITIONAL_INCLUDE_DIRS += \
+       -I.. -I../..                    \
+       -I../../sope-core/              \
+       -I../../sope-core/NGExtensions
+
+
+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../GDLAccess/$(GNUSTEP_OBJ_DIR)\
+       -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)
+endif
 
 SYSTEM_LIB_DIR += \
        -L/usr/local/lib                \

diff --git a/sope-gdl1/SQLite3/Version b/sope-gdl1/SQLite3/Version
index eaa8b063b0e0c74b4fb9f3e9c6bff2ab90f792a3..b6d35ff69a5eab0e472ae73376e6314f86240bb9 100644 (file)
--- a/sope-gdl1/SQLite3/Version
+++ b/sope-gdl1/SQLite3/Version
@@ -1,5 +1,5 @@
 # Version file
 
-SUBMINOR_VERSION:=18
+SUBMINOR_VERSION:=19
 
 # v4.5.17 requires libGDLAccess v4.5.50