quickfix for Leopard compile

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

diff --git a/sope-core/NGExtensions/GNUmakefile.preamble b/sope-core/NGExtensions/GNUmakefile.preamble
index 19c8a805c0b298ff19bbf03885ec0f52cc9eda51..998376cd81992c3f3f826481839f9cd7cf4523c7 100644 (file)
--- a/sope-core/NGExtensions/GNUmakefile.preamble
+++ b/sope-core/NGExtensions/GNUmakefile.preamble
@@ -1,22 +1,58 @@
-# $Id$
+# compilation settings
+
+ADDITIONAL_INCLUDE_DIRS += \
+       -I./NGExtensions/       \
+       -I./FdExt.subproj/ -I./EOExt.subproj/
 
 ADDITIONAL_CPP_FLAGS     += -Wall -Wno-import -Wno-protocol -O2
 libNGExtensions_INCLUDE_DIRS += -I..
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/..
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
 
-libNGExtensions_LIB_DIRS += \
-       -L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME)      \
-       -L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME)
+# Parameters for resource lookup
+
+ifneq ($(FHS_INSTALL_ROOT),)
+ADDITIONAL_CPPFLAGS += -DFHS_INSTALL_ROOT=\@\"$(FHS_INSTALL_ROOT)\"
+endif
+
+ifeq ($(CONFIGURE_64BIT),yes)
+ADDITIONAL_CPPFLAGS += -DCONFIGURE_64BIT=1
+endif
+
+
+# dependencies
+
+libNGExtensions_LIBRARIES_DEPEND_UPON += \
+       -lEOControl -lDOM -lSaxObjC \
+       -lobjc \
+       -lz
+
+NGExtensions_LIBRARIES_DEPEND_UPON += \
+       -framework EOControl \
+       -framework DOM -framework SaxObjC \
+       -lz
+
+
+# library/framework search pathes
+
+DEP_DIRS = \
+       ../EOControl \
+       ../../sope-xml/DOM ../../sope-xml/SaxObjC
+
+ifneq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),\
+         -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
 else
-libNGExtensions_LIB_DIRS += \
-       -L../EOControl/$(GNUSTEP_OBJ_DIR) \
-       -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
+endif
+
+ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
+SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64
+else
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 endif
 
-libNGExtensions_LIBRARIES_DEPEND_UPON += -lEOControl -lDOM -lSaxObjC -lz
 
 # Apple
 
@@ -25,6 +61,7 @@ libNGExtensions_PREBIND_ADDR="0xC1200000"
 libNGExtensions_LDFLAGS += -seg1addr $(libNGExtensions_PREBIND_ADDR)
 endif
 
+
 # platform specific settings
 
 ifeq ($(GNUSTEP_TARGET_OS),mingw32)