patched makefile for inline compilation

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

diff --git a/sope-gdl1/MySQL/ChangeLog b/sope-gdl1/MySQL/ChangeLog
index 8daf1b9e31ea6594f11f6ca02bcf4d9bd92adb7c..5c75ebbb33a1801fbc714c204d75822bcf451c24 100644 (file)
--- a/sope-gdl1/MySQL/ChangeLog
+++ b/sope-gdl1/MySQL/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-23  Helge Hess  <helge.hess@opengroupware.org>
+
+       * GNUmakefile.preamble: fixed include flags (v4.5.10)
+
 2005-04-21  Helge Hess  <helge.hess@skyrix.com>
 
        * v4.5.9

diff --git a/sope-gdl1/MySQL/GNUmakefile.preamble b/sope-gdl1/MySQL/GNUmakefile.preamble
index d1fa4223d75f172f39a1da0dbf1e12f2bcaca31c..88add3d2276c9fdae16bf6759f3a7c4d71021501 100644 (file)
--- a/sope-gdl1/MySQL/GNUmakefile.preamble
+++ b/sope-gdl1/MySQL/GNUmakefile.preamble
@@ -40,10 +40,27 @@ gdltest_TOOL_LIBS += \
 
 ADDITIONAL_CFLAGS += `mysql_config --cflags`
 
-ADDITIONAL_INCLUDE_DIRS += -I.. -I../..
+ADDITIONAL_INCLUDE_DIRS += \
+       -I../GDLAccess -I.. -I../..
 
+ADDITIONAL_INCLUDE_DIRS += \
+       -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/MySQL/Version b/sope-gdl1/MySQL/Version
index b191a15e76dac3e66bcd9f3cefe22e3b7ade21f4..c7825e078ab1a600cba9b22cbe0e1d7cdea587b8 100644 (file)
--- a/sope-gdl1/MySQL/Version
+++ b/sope-gdl1/MySQL/Version
@@ -1,3 +1,3 @@
 # Version file
 
-SUBMINOR_VERSION:=9
+SUBMINOR_VERSION:=10