From 10cc7d9df8f763b81bb6f6ab8d6d21182dbfe651 Mon Sep 17 00:00:00 2001 From: helge Date: Fri, 22 Apr 2005 22:44:36 +0000 Subject: [PATCH] patched makefile for inline compilation git-svn-id: http://svn.opengroupware.org/SOPE/trunk@759 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-gdl1/MySQL/ChangeLog | 4 ++++ sope-gdl1/MySQL/GNUmakefile.preamble | 21 +++++++++++++++++++-- sope-gdl1/MySQL/Version | 2 +- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/sope-gdl1/MySQL/ChangeLog b/sope-gdl1/MySQL/ChangeLog index 8daf1b9e..5c75ebbb 100644 --- a/sope-gdl1/MySQL/ChangeLog +++ b/sope-gdl1/MySQL/ChangeLog @@ -1,3 +1,7 @@ +2005-04-23 Helge Hess + + * GNUmakefile.preamble: fixed include flags (v4.5.10) + 2005-04-21 Helge Hess * v4.5.9 diff --git a/sope-gdl1/MySQL/GNUmakefile.preamble b/sope-gdl1/MySQL/GNUmakefile.preamble index d1fa4223..88add3d2 100644 --- 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 b191a15e..c7825e07 100644 --- a/sope-gdl1/MySQL/Version +++ b/sope-gdl1/MySQL/Version @@ -1,3 +1,3 @@ # Version file -SUBMINOR_VERSION:=9 +SUBMINOR_VERSION:=10 -- 2.39.5