From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Tue, 16 Aug 2005 22:55:06 +0000 (+0000)
Subject: fixed WOxExtTest for framework builds
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5da09fa46d7fc20999aab58af3a3a74c51dd22c0;p=sope

fixed WOxExtTest for framework builds


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

diff --git a/sope-appserver/WOExtensions/GNUmakefile.preamble b/sope-appserver/WOExtensions/GNUmakefile.preamble
index d475d205..34b1bd53 100644
--- a/sope-appserver/WOExtensions/GNUmakefile.preamble
+++ b/sope-appserver/WOExtensions/GNUmakefile.preamble
@@ -10,12 +10,12 @@ endif
 
 ADDITIONAL_CPPFLAGS += -Wall
 ADDITIONAL_INCLUDE_DIRS += \
-	-I.. -I../..			\
+	-I.. -I$(SOPE_ROOT)			\
 	-I../NGObjWeb			\
-	-I../../sope-core/NGStreams	\
-	-I../../sope-core/NGExtensions	\
-	-I../../sope-core		\
-	-I../../sope-xml
+	-I$(SOPE_ROOT)/sope-core/NGStreams	\
+	-I$(SOPE_ROOT)/sope-core/NGExtensions	\
+	-I$(SOPE_ROOT)/sope-core		\
+	-I$(SOPE_ROOT)/sope-xml
 
 
 libWOExtensions_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
diff --git a/sope-appserver/samples/WOxExtTest/ChangeLog b/sope-appserver/samples/WOxExtTest/ChangeLog
index d7b84abc..7f27f1a7 100644
--- a/sope-appserver/samples/WOxExtTest/ChangeLog
+++ b/sope-appserver/samples/WOxExtTest/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-16  Helge Hess  <helge.hess@opengroupware.org>
+
+	* GNUmakefile.preamble: added linking against frameworks
+
 2005-08-01  Helge Hess  <helge.hess@skyrix.com>
 
 	* fixed gcc 4.0 warnings
diff --git a/sope-appserver/samples/WOxExtTest/GNUmakefile.preamble b/sope-appserver/samples/WOxExtTest/GNUmakefile.preamble
index d862a7db..b8b82ebe 100644
--- a/sope-appserver/samples/WOxExtTest/GNUmakefile.preamble
+++ b/sope-appserver/samples/WOxExtTest/GNUmakefile.preamble
@@ -1,18 +1,40 @@
 # compile settings
 
-APPSERVER=".."
+SOPE_ROOT=../../..
+APPSERVER="../.."
 
-WOxExtTest_TOOL_LIBS += \
-	-lWEExtensions -lWOExtensions	\
-	-lNGObjWeb			\
-	-lEOControl			\
-	-lXmlRpc -lDOM -lSaxObjC
+ADDITIONAL_CPPFLAGS += -Wall
 
-WOxExtTest_LIB_DIRS += \
-	-L$(APPSERVER)/WEExtensions/$(GNUSTEP_OBJ_DIR)	\
-	-L$(APPSERVER)/WOExtensions/$(GNUSTEP_OBJ_DIR)	\
-	-L$(APPSERVER)/NGObjWeb/$(GNUSTEP_OBJ_DIR)	\
 
-ADDITIONAL_CPPFLAGS += -Wall
+# dependencies
+
+ifneq ($(frameworks),yes)
+WOxExtTest_TOOL_LIBS +=	-lWEExtensions -lWOExtensions
+else
+WOxExtTest_TOOL_LIBS +=	-framework WEExtensions -framework WOExtensions
+endif
+
+# library/framework search pathes
+
+DEP_DIRS = \
+	$(APPSERVER)/WOExtensions \
+	$(APPSERVER)/WEExtensions \
+	$(APPSERVER)/NGObjWeb	\
+	$(SOPE_ROOT)/sope-mime			\
+	$(SOPE_ROOT)/sope-core/NGStreams	\
+	$(SOPE_ROOT)/sope-core/NGExtensions	\
+	$(SOPE_ROOT)/sope-core/EOControl	\
+	$(SOPE_ROOT)/sope-xml/DOM		\
+	$(SOPE_ROOT)/sope-xml/XmlRpc		\
+	$(SOPE_ROOT)/sope-xml/SaxObjC
+
+ifneq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+	$(foreach dir,$(DEP_DIRS),\
+	  -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
+else
+ADDITIONAL_LIB_DIRS += \
+	$(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
+endif
 
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib