From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Sat, 27 Aug 2005 12:59:02 +0000 (+0000)
Subject: fixed a osx library dependency
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c337f01e6b99199463a7c0d2f51da4ec3bbfd9b4;p=sope

fixed a osx library dependency
improved PCH support


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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 8227755f..8ee1dfa2 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-27  Helge Hess  <helge.hess@opengroupware.org>
+
+	* GNUmakefile.preamble: improved dependency handling (v4.5.193)
+
 2005-08-23  Helge Hess  <helge.hess@opengroupware.org>
 
 	* v4.5.192
diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index 6150111f..94de68f2 100644
--- a/sope-appserver/NGObjWeb/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble
@@ -54,28 +54,41 @@ SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 # dependencies
 
+ifneq ($(frameworks),yes)
+sope-xml-libs  = -lXmlRpc -lDOM -lSaxObjC
+sope-core-libs = -lNGStreams -lNGExtensions -lEOControl
+sope-mime-libs = -lNGMime
+sope-ngobjweb-libs = -lNGObjWeb
+else
+sope-xml-libs  = -framework XmlRpc -framework DOM -framework SaxObjC
+sope-core-libs = \
+  -framework NGStreams -framework NGExtensions -framework EOControl
+sope-mime-libs = -framework NGMime -framework NGMail
+sope-ngobjweb-libs = -framework NGObjWeb 
+endif
+
 libNGObjWeb_LIBRARIES_DEPEND_UPON += \
-	-lNGMime \
-	-lNGStreams -lNGExtensions -lEOControl	\
-	-lXmlRpc -lDOM -lSaxObjC
+	$(sope-mime-libs) \
+	$(sope-core-libs) \
+	$(sope-xml-libs)
 NGObjWeb_LIBRARIES_DEPEND_UPON += \
-	-framework NGMime -framework NGMail \
-	-framework NGStreams -framework NGExtensions -framework EOControl \
-	-framework XmlRpc -framework DOM -framework SaxObjC
+	$(sope-mime-libs) \
+	$(sope-core-libs)\
+	$(sope-xml-libs)
+
+
+ADDITIONAL_LIB_DIRS  += $(libNGObjWeb_LIB_DIRS) -F.
 
-wod_LIB_DIRS  += $(libNGObjWeb_LIB_DIRS) -F.
-ifneq ($(frameworks),yes)
-wod_TOOL_LIBS += \
-	-lNGObjWeb \
-	-lNGMime -lNGStreams -lNGExtensions -lEOControl \
-	-lXmlRpc -lDOM -lSaxObjC
-else
 wod_TOOL_LIBS += \
-	-framework NGObjWeb \
-	-framework NGMime \
-	-framework NGStreams -framework NGExtensions -framework EOControl \
-	-framework XmlRpc -framework DOM -framework SaxObjC
-endif
+	$(sope-ngobjweb-libs)	\
+	$(sope-mime-libs)	\
+	$(sope-core-libs)	\
+	$(sope-xml-libs)
+SoCore_BUNDLE_LIBS += \
+	$(sope-ngobjweb-libs)	\
+	$(sope-mime-libs)	\
+	$(sope-core-libs)	\
+	$(sope-xml-libs)
 
 
 # platform specific settings
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 7baefdff..a85a8f30 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=192
+SUBMINOR_VERSION:=193
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134
diff --git a/sope-appserver/WEExtensions/ChangeLog b/sope-appserver/WEExtensions/ChangeLog
index 9a59246b..70af60d2 100644
--- a/sope-appserver/WEExtensions/ChangeLog
+++ b/sope-appserver/WEExtensions/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-27  Helge Hess  <helge.hess@opengroupware.org>
+
+	* WETableView: added common.h file to support PCH (not required for
+	  Xcode) (v4.5.81)
+
 2005-08-05  Helge Hess  <helge.hess@opengroupware.org>
 
 	* JSStringTable.m: fixed a non-lF warning (v4.5.80)
diff --git a/sope-appserver/WEExtensions/GNUmakefile b/sope-appserver/WEExtensions/GNUmakefile
index ae5c0f50..84779388 100644
--- a/sope-appserver/WEExtensions/GNUmakefile
+++ b/sope-appserver/WEExtensions/GNUmakefile
@@ -22,6 +22,8 @@ endif
 FHS_MANPAGES += doc/*.3
 
 libWEExtensions_PCH_FILE = common.h
+WEExtensions_PCH_FILE = common.h
+
 libWEExtensions_HEADER_FILES_DIR         = .
 libWEExtensions_HEADER_FILES_INSTALL_DIR = /WEExtensions
 
diff --git a/sope-appserver/WEExtensions/Version b/sope-appserver/WEExtensions/Version
index beb0cd83..b5e19865 100644
--- a/sope-appserver/WEExtensions/Version
+++ b/sope-appserver/WEExtensions/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=80
+SUBMINOR_VERSION:=81
 
 # v4.5.76 requires libNGObjWeb v4.5.176
 # v4.5.75 requires libNGObjWeb v4.5.174
diff --git a/sope-appserver/WEExtensions/WETableView/GNUmakefile b/sope-appserver/WEExtensions/WETableView/GNUmakefile
index e2d2285e..4e511b3e 100644
--- a/sope-appserver/WEExtensions/WETableView/GNUmakefile
+++ b/sope-appserver/WEExtensions/WETableView/GNUmakefile
@@ -5,6 +5,8 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 SUBPROJECT_NAME = WETableView
 
+WETableView_PCH_FILE = common.h
+
 WETableView_OBJC_FILES = \
 	WETableCell.m		\
 	WETableData.m		\
diff --git a/sope-appserver/WEExtensions/WETableView/common.h b/sope-appserver/WEExtensions/WETableView/common.h
new file mode 100644
index 00000000..1898d06d
--- /dev/null
+++ b/sope-appserver/WEExtensions/WETableView/common.h
@@ -0,0 +1 @@
+#include "../common.h"
diff --git a/sope-appserver/WOExtensions/GNUmakefile b/sope-appserver/WOExtensions/GNUmakefile
index 51b527f8..cb7ee067 100644
--- a/sope-appserver/WOExtensions/GNUmakefile
+++ b/sope-appserver/WOExtensions/GNUmakefile
@@ -19,6 +19,8 @@ endif
 FHS_MANPAGES += doc/*.3
 
 libWOExtensions_PCH_FILE = common.h
+WOExtensions_PCH_FILE = common.h
+
 libWOExtensions_HEADER_FILES_DIR	 = .
 libWOExtensions_HEADER_FILES_INSTALL_DIR = /WOExtensions