added PCH support for frameworks

[sope] / sope-core / EOCoreData / GNUmakefile.preamble

diff --git a/sope-core/EOCoreData/GNUmakefile.preamble b/sope-core/EOCoreData/GNUmakefile.preamble
index b3213f0843d4c5e5e1ac0808b02b794d9ce6b5f1..62e1aff03c5d6ac56404f9c624fd7b7ec1227b30 100644 (file)
--- a/sope-core/EOCoreData/GNUmakefile.preamble
+++ b/sope-core/EOCoreData/GNUmakefile.preamble
@@ -6,20 +6,24 @@ libEOCoreData_INCLUDE_DIRS += -I..
 
 ADDITIONAL_CPPFLAGS += -Wall -funsigned-char
 
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+libEOCoreData_LIBRARIES_DEPEND_UPON += -lEOControl
+EOCoreData_LIBRARIES_DEPEND_UPON += -framework EOControl
+
+
+# library/framework search pathes
 
+DEP_DIRS = ../EOControl
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/..
-libEOCoreData_LIB_DIRS += \
-       -L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME)
+ifneq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),\
+         -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
 else
-libEOCoreData_LIB_DIRS += \
-       -L../EOControl/$(GNUSTEP_OBJ_DIR)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
-libEOCoreData_LIBRARIES_DEPEND_UPON += -lEOControl
-
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 
 # libFoundation, gstep-base
@@ -39,6 +43,7 @@ ifeq ($(FOUNDATION_LIB),apple)
 # TODO: libEOCoreData_PREBIND_ADDR="0xC1000000"
 ifneq ($(libEOCoreData_PREBIND_ADDR),)
 libEOCoreData_LDFLAGS += -seg1addr $(libEOCoreData_PREBIND_ADDR)
+EOCoreData_LDFLAGS += -seg1addr $(libEOCoreData_PREBIND_ADDR)
 endif
 
 ADDITIONAL_LDFLAGS += -framework CoreData