From 10f04edff7e17a125e3c1ab405ec52c3e11df07a Mon Sep 17 00:00:00 2001 From: helge Date: Sun, 17 Oct 2004 17:18:42 +0000 Subject: [PATCH] include config.make in makefiles git-svn-id: http://svn.opengroupware.org/SOPE/trunk@271 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- GNUmakefile | 1 + configure | 47 ++++++++++++++++--- sope-appserver/GNUmakefile | 3 +- .../NGObjWeb/Associations/GNUmakefile | 3 +- sope-appserver/NGObjWeb/ChangeLog | 4 ++ .../NGObjWeb/DynamicElements/GNUmakefile | 3 +- sope-appserver/NGObjWeb/GNUmakefile | 3 +- sope-appserver/NGObjWeb/NGHttp/GNUmakefile | 3 +- sope-appserver/NGObjWeb/SoObjects/GNUmakefile | 3 +- sope-appserver/NGObjWeb/Templates/GNUmakefile | 3 +- sope-appserver/NGObjWeb/Version | 2 +- .../NGObjWeb/WOHttpAdaptor/GNUmakefile | 3 +- sope-appserver/NGObjWeb/WebDAV/GNUmakefile | 3 +- sope-appserver/NGXmlRpc/GNUmakefile | 1 + sope-appserver/SoOFS/GNUmakefile | 1 + sope-appserver/WEExtensions/GNUmakefile | 3 +- sope-appserver/WOExtensions/GNUmakefile | 3 +- sope-appserver/WOXML/GNUmakefile | 3 +- sope-appserver/mod_ngobjweb/GNUmakefile | 3 +- sope-appserver/samples/GNUmakefile | 3 +- sope-appserver/samples/HelloWorld/GNUmakefile | 3 +- sope-appserver/samples/TestPages/GNUmakefile | 3 +- sope-appserver/samples/WOxExtTest/GNUmakefile | 1 + sope-appserver/samples/davpropget/GNUmakefile | 3 +- sope-appserver/samples/iCalPortal/GNUmakefile | 3 +- sope-appserver/samples/parsedav/GNUmakefile | 3 +- sope-core/ChangeLog | 4 ++ sope-core/EOControl/GNUmakefile | 3 +- sope-core/GNUmakefile | 3 ++ .../NGExtensions/EOExt.subproj/GNUmakefile | 3 +- .../NGExtensions/FdExt.subproj/GNUmakefile | 3 +- sope-core/NGExtensions/GNUmakefile | 1 + .../NGRuleEngine.subproj/GNUmakefile | 3 +- .../NGExtensions/XmlExt.subproj/GNUmakefile | 3 +- sope-core/NGStreams/GNUmakefile | 6 +-- sope-core/samples/GNUmakefile | 3 +- sope-gdl1/FrontBase2/GNUmakefile | 5 +- sope-gdl1/GDLAccess/GNUmakefile | 3 +- sope-gdl1/GNUmakefile | 3 +- sope-gdl1/PostgreSQL/GNUmakefile | 3 +- sope-ldap/GNUmakefile | 3 ++ sope-ldap/NGLdap/ChangeLog | 4 ++ sope-ldap/NGLdap/GNUmakefile | 3 +- sope-ldap/NGLdap/Version | 4 +- sope-ldap/samples/GNUmakefile | 3 +- sope-mime/GNUmakefile | 3 +- sope-mime/NGImap4/GNUmakefile | 3 ++ sope-mime/NGMail/GNUmakefile | 3 +- sope-mime/NGMime/GNUmakefile | 3 +- sope-mime/samples/GNUmakefile | 3 +- sope-xml/ChangeLog | 4 ++ sope-xml/DOM/GNUmakefile | 3 +- sope-xml/GNUmakefile | 3 +- sope-xml/STXSaxDriver/GNUmakefile | 3 +- sope-xml/SaxObjC/GNUmakefile | 3 +- sope-xml/XmlRpc/GNUmakefile | 3 +- sope-xml/libxmlSAXDriver/GNUmakefile | 3 +- sope-xml/pyxSAXDriver/GNUmakefile | 3 +- sope-xml/samples/GNUmakefile | 1 + xmlrpc_call/GNUmakefile | 1 + 60 files changed, 161 insertions(+), 58 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 4861531f..f85f2c0d 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,5 +1,6 @@ # Note: could be that it may not fully compile 'inline' +-include ./config.make include $(GNUSTEP_MAKEFILES)/common.make SUBPROJECTS += \ diff --git a/configure b/configure index ba111805..2fb91919 100755 --- a/configure +++ b/configure @@ -17,6 +17,7 @@ ARG_PREFIX="" ARG_GSMAKE="$GNUSTEP_MAKEFILES" ARG_CFGMAKE="$PWD/config.make" ARG_WITH_GNUSTEP=0 +ARG_WITH_DEBUG=0 DARG_GNUSTEP_SH="$ARG_GSMAKE/GNUstep.sh" DARG_IS_FHS=1 @@ -43,6 +44,7 @@ Installation directories: --gsmake=PATH path to gnustep-make tree --configmake=PATH path to the config file being created --with-gnustep install in GNUstep tree + --enable-debug turn on debugging and compile time warnings _ACEOF @@ -60,6 +62,12 @@ function printParas() { else echo " FHS: install in GNUstep tree"; fi + + if test $ARG_WITH_DEBUG = 1; then + echo " debug: yes"; + else + echo " debug: no"; + fi echo " prefix: $ARG_PREFIX" echo " gstep: $ARG_GSMAKE" @@ -127,7 +135,7 @@ function validateArgs() { else DARG_IS_FHS=1; ARG_PREFIX="/usr/local/" - echo "Note: will install in $ARG_PREFIX" + echo "Note: will install in default location: $ARG_PREFIX" echo "" fi ;; @@ -171,9 +179,9 @@ function cfgwrite() { function genConfigMake() { # we ignore the following vars also patches by gstep-make: - # GUILE_LOAD_PATH # PATH # DYLD_LIBRARY_PATH + # GUILE_LOAD_PATH # CLASSPATH if test $ARG_BEQUIET != 1; then @@ -181,15 +189,39 @@ function genConfigMake() { fi echo "# GNUstep environment configuration" > $ARG_CFGMAKE - cfgwrite "# created by: '$CFG_ARGS'"; - cfgwrite ""; + cfgwrite "# created by: '$CFG_ARGS'" + cfgwrite "" + + cfgwrite "# Note: you can override any option as a 'make' parameter, eg:" + cfgwrite "# make debug=yes" + cfgwrite "" + + cfgwrite "# print on the cmdline that this file is being used" + cfgwrite "before-all :: " + cfgwrite " @echo Local GNUstep config.make is active" + cfgwrite "" + + # TODO: should be also write a GNUSTEP_INSTALLATION_DIR / BUNDLE_INSTALL_DIR? if test $DARG_IS_FHS = 1; then - cfgwrite "# configured for FHS install"; - cfgwrite "FHS_INSTALL_ROOT=$ARG_PREFIX" + cfgwrite "# configured for FHS install" + cfgwrite "FHS_INSTALL_ROOT:=$ARG_PREFIX" cfgwrite "" fi + if test $ARG_WITH_DEBUG = 1; then + cfgwrite "# configured to produce debugging code"; + cfgwrite "debug:=yes" + else + cfgwrite "# configured to produce non-debugging code"; + cfgwrite "debug:=no" + fi + cfgwrite "" + + cfgwrite "# enforce shared libraries"; + cfgwrite "shared:=yes" + cfgwrite "" + cfgwrite "# GNUstep environment variables:"; for i in `env | grep GNUSTEP_ | sort`; do MAKE_ASSI="`echo $i | sed s/=/:=/`" @@ -241,6 +273,9 @@ function processOption() { ARG_WITH_GNUSTEP=1 DARG_IS_FHS=0 ;; + "x--enable-debug") + ARG_WITH_DEBUG=1 + ;; *) echo "error: cannot process argument: $1"; exit 1; ;; esac diff --git a/sope-appserver/GNUmakefile b/sope-appserver/GNUmakefile index a2f05030..89e3e12d 100644 --- a/sope-appserver/GNUmakefile +++ b/sope-appserver/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 6 2004-08-20 17:57:50Z helge $ +# GNUstep makefile +-include ../config.make include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=sope-appserver diff --git a/sope-appserver/NGObjWeb/Associations/GNUmakefile b/sope-appserver/NGObjWeb/Associations/GNUmakefile index 0ae0306d..9614f2d7 100644 --- a/sope-appserver/NGObjWeb/Associations/GNUmakefile +++ b/sope-appserver/NGObjWeb/Associations/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../../config.make include $(GNUSTEP_MAKEFILES)/common.make SUBPROJECT_NAME = Associations diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index a106f8b1..542ae2a2 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,7 @@ +2004-10-17 Helge Hess + + * include config.make if available (v4.3.67) + 2004-10-16 Marcus Mueller * NGObjWeb.xcode: added WOxTagClassElemBuilder.m and diff --git a/sope-appserver/NGObjWeb/DynamicElements/GNUmakefile b/sope-appserver/NGObjWeb/DynamicElements/GNUmakefile index 295a9a2f..268d3785 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/GNUmakefile +++ b/sope-appserver/NGObjWeb/DynamicElements/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../../config.make include $(GNUSTEP_MAKEFILES)/common.make SUBPROJECT_NAME = DynamicElements diff --git a/sope-appserver/NGObjWeb/GNUmakefile b/sope-appserver/NGObjWeb/GNUmakefile index 6b122734..f7a123f0 100644 --- a/sope-appserver/NGObjWeb/GNUmakefile +++ b/sope-appserver/NGObjWeb/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $ +# GNUstep makefile +-include ../../config.make include ../common.make include ./Version diff --git a/sope-appserver/NGObjWeb/NGHttp/GNUmakefile b/sope-appserver/NGObjWeb/NGHttp/GNUmakefile index 7fb02d87..2f98be49 100644 --- a/sope-appserver/NGObjWeb/NGHttp/GNUmakefile +++ b/sope-appserver/NGObjWeb/NGHttp/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../../config.make include $(GNUSTEP_MAKEFILES)/common.make GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT) diff --git a/sope-appserver/NGObjWeb/SoObjects/GNUmakefile b/sope-appserver/NGObjWeb/SoObjects/GNUmakefile index 0f2ba6f1..e5b26b24 100644 --- a/sope-appserver/NGObjWeb/SoObjects/GNUmakefile +++ b/sope-appserver/NGObjWeb/SoObjects/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 1 2004-08-20 10:08:27Z znek $ +# GNUstep makefile +-include ../../../config.make include ../subdirs.make SUBPROJECT_NAME = SoObjects diff --git a/sope-appserver/NGObjWeb/Templates/GNUmakefile b/sope-appserver/NGObjWeb/Templates/GNUmakefile index a64e148f..be65cb63 100644 --- a/sope-appserver/NGObjWeb/Templates/GNUmakefile +++ b/sope-appserver/NGObjWeb/Templates/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUmakefile makefile +-include ../../../config.make include ../subdirs.make SUBPROJECT_NAME = Templates diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 169c13e0..a147ab14 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=66 +SUBMINOR_VERSION:=67 # v4.3.42 requires libNGExtensions v4.3.116 # v4.3.40 requires libNGExtensions v4.3.115 diff --git a/sope-appserver/NGObjWeb/WOHttpAdaptor/GNUmakefile b/sope-appserver/NGObjWeb/WOHttpAdaptor/GNUmakefile index 1560a15f..a66bdb1b 100644 --- a/sope-appserver/NGObjWeb/WOHttpAdaptor/GNUmakefile +++ b/sope-appserver/NGObjWeb/WOHttpAdaptor/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../../config.make include $(GNUSTEP_MAKEFILES)/common.make SUBPROJECT_NAME = WOHttpAdaptor diff --git a/sope-appserver/NGObjWeb/WebDAV/GNUmakefile b/sope-appserver/NGObjWeb/WebDAV/GNUmakefile index 9ed6baa6..914b4bef 100644 --- a/sope-appserver/NGObjWeb/WebDAV/GNUmakefile +++ b/sope-appserver/NGObjWeb/WebDAV/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../../config.make include $(GNUSTEP_MAKEFILES)/common.make SUBPROJECT_NAME = WebDAV diff --git a/sope-appserver/NGXmlRpc/GNUmakefile b/sope-appserver/NGXmlRpc/GNUmakefile index 5b4c75a8..1effd505 100644 --- a/sope-appserver/NGXmlRpc/GNUmakefile +++ b/sope-appserver/NGXmlRpc/GNUmakefile @@ -1,5 +1,6 @@ # GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make include ../Version include ./Version diff --git a/sope-appserver/SoOFS/GNUmakefile b/sope-appserver/SoOFS/GNUmakefile index a1b1893a..a581b9a3 100644 --- a/sope-appserver/SoOFS/GNUmakefile +++ b/sope-appserver/SoOFS/GNUmakefile @@ -1,5 +1,6 @@ # GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make include ../Version include ./Version diff --git a/sope-appserver/WEExtensions/GNUmakefile b/sope-appserver/WEExtensions/GNUmakefile index 0ca4b0c6..490b2c18 100644 --- a/sope-appserver/WEExtensions/GNUmakefile +++ b/sope-appserver/WEExtensions/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make include ../Version include ./Version diff --git a/sope-appserver/WOExtensions/GNUmakefile b/sope-appserver/WOExtensions/GNUmakefile index fc181b0d..bb8baed6 100644 --- a/sope-appserver/WOExtensions/GNUmakefile +++ b/sope-appserver/WOExtensions/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make include ../Version include ./Version diff --git a/sope-appserver/WOXML/GNUmakefile b/sope-appserver/WOXML/GNUmakefile index 8e3bfd89..87ada9d4 100644 --- a/sope-appserver/WOXML/GNUmakefile +++ b/sope-appserver/WOXML/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../config.make include ../common.make include ../Version include ./Version diff --git a/sope-appserver/mod_ngobjweb/GNUmakefile b/sope-appserver/mod_ngobjweb/GNUmakefile index 0a725213..869b4dc9 100644 --- a/sope-appserver/mod_ngobjweb/GNUmakefile +++ b/sope-appserver/mod_ngobjweb/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# custom makefile +-include ../../config.make -include $(GNUSTEP_MAKEFILES)/common.make # config diff --git a/sope-appserver/samples/GNUmakefile b/sope-appserver/samples/GNUmakefile index 59c11b7a..4803c916 100644 --- a/sope-appserver/samples/GNUmakefile +++ b/sope-appserver/samples/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make SUBPROJECTS += \ diff --git a/sope-appserver/samples/HelloWorld/GNUmakefile b/sope-appserver/samples/HelloWorld/GNUmakefile index 7581d327..daee1af5 100644 --- a/sope-appserver/samples/HelloWorld/GNUmakefile +++ b/sope-appserver/samples/HelloWorld/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../../config.make include $(GNUSTEP_MAKEFILES)/common.make WOAPP_NAME = HelloWorld diff --git a/sope-appserver/samples/TestPages/GNUmakefile b/sope-appserver/samples/TestPages/GNUmakefile index 6607c5c4..35747884 100644 --- a/sope-appserver/samples/TestPages/GNUmakefile +++ b/sope-appserver/samples/TestPages/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 1 2004-08-20 10:08:27Z znek $ +# GNUstep makefile +-include ../../../config.make include $(GNUSTEP_MAKEFILES)/common.make WOAPP_NAME = TestPages diff --git a/sope-appserver/samples/WOxExtTest/GNUmakefile b/sope-appserver/samples/WOxExtTest/GNUmakefile index b667beec..9e433ce0 100644 --- a/sope-appserver/samples/WOxExtTest/GNUmakefile +++ b/sope-appserver/samples/WOxExtTest/GNUmakefile @@ -1,5 +1,6 @@ # GNUstep makefiles +-include ../../../config.make include $(GNUSTEP_MAKEFILES)/common.make WOAPP_NAME = WOxExtTest diff --git a/sope-appserver/samples/davpropget/GNUmakefile b/sope-appserver/samples/davpropget/GNUmakefile index 519fa249..90268128 100644 --- a/sope-appserver/samples/davpropget/GNUmakefile +++ b/sope-appserver/samples/davpropget/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../../config.make include $(GNUSTEP_MAKEFILES)/common.make TOOL_NAME = davpropget diff --git a/sope-appserver/samples/iCalPortal/GNUmakefile b/sope-appserver/samples/iCalPortal/GNUmakefile index 20a065d0..744bb768 100644 --- a/sope-appserver/samples/iCalPortal/GNUmakefile +++ b/sope-appserver/samples/iCalPortal/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../../config.make include $(GNUSTEP_MAKEFILES)/common.make WOAPP_NAME = iCalPortal diff --git a/sope-appserver/samples/parsedav/GNUmakefile b/sope-appserver/samples/parsedav/GNUmakefile index 1ad78c2b..c3922761 100644 --- a/sope-appserver/samples/parsedav/GNUmakefile +++ b/sope-appserver/samples/parsedav/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../../config.make include $(GNUSTEP_MAKEFILES)/common.make TOOL_NAME = parsedav diff --git a/sope-core/ChangeLog b/sope-core/ChangeLog index 9229af10..b59a1223 100644 --- a/sope-core/ChangeLog +++ b/sope-core/ChangeLog @@ -1,3 +1,7 @@ +2004-10-17 Helge Hess + + * all makefiles: include config.make if available + 2004-09-22 Marcus Mueller * sope-core.xcode: Fixed wrong build order diff --git a/sope-core/EOControl/GNUmakefile b/sope-core/EOControl/GNUmakefile index cf632f3e..aa6c8b5e 100644 --- a/sope-core/EOControl/GNUmakefile +++ b/sope-core/EOControl/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $ +# GNUstep makefile +-include ../../config.make include ../common.make LIBRARY_NAME = libEOControl diff --git a/sope-core/GNUmakefile b/sope-core/GNUmakefile index 7f58da2c..63b3c21f 100644 --- a/sope-core/GNUmakefile +++ b/sope-core/GNUmakefile @@ -1,3 +1,6 @@ +# GNUstep makefile + +-include ../config.make include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=sope-core diff --git a/sope-core/NGExtensions/EOExt.subproj/GNUmakefile b/sope-core/NGExtensions/EOExt.subproj/GNUmakefile index 7564fddc..860c8302 100644 --- a/sope-core/NGExtensions/EOExt.subproj/GNUmakefile +++ b/sope-core/NGExtensions/EOExt.subproj/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../../config.make include ../../common.make SUBPROJECT_NAME = EOExt diff --git a/sope-core/NGExtensions/FdExt.subproj/GNUmakefile b/sope-core/NGExtensions/FdExt.subproj/GNUmakefile index bfc4e162..82e1db2b 100644 --- a/sope-core/NGExtensions/FdExt.subproj/GNUmakefile +++ b/sope-core/NGExtensions/FdExt.subproj/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../../config.make include ../../common.make SUBPROJECT_NAME = FdExt diff --git a/sope-core/NGExtensions/GNUmakefile b/sope-core/NGExtensions/GNUmakefile index e1c476bc..177a82a7 100644 --- a/sope-core/NGExtensions/GNUmakefile +++ b/sope-core/NGExtensions/GNUmakefile @@ -1,5 +1,6 @@ # GNUstep makefile +-include ../../config.make include ../common.make LIBRARY_NAME = libNGExtensions diff --git a/sope-core/NGExtensions/NGRuleEngine.subproj/GNUmakefile b/sope-core/NGExtensions/NGRuleEngine.subproj/GNUmakefile index 5f466eca..c18cb0d3 100644 --- a/sope-core/NGExtensions/NGRuleEngine.subproj/GNUmakefile +++ b/sope-core/NGExtensions/NGRuleEngine.subproj/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../../config.make include ../../common.make SUBPROJECT_NAME = NGRuleEngine diff --git a/sope-core/NGExtensions/XmlExt.subproj/GNUmakefile b/sope-core/NGExtensions/XmlExt.subproj/GNUmakefile index 988909bc..cad5a45d 100644 --- a/sope-core/NGExtensions/XmlExt.subproj/GNUmakefile +++ b/sope-core/NGExtensions/XmlExt.subproj/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../../config.make include ../../common.make SUBPROJECT_NAME = XmlExt diff --git a/sope-core/NGStreams/GNUmakefile b/sope-core/NGStreams/GNUmakefile index 93702e58..000ea070 100644 --- a/sope-core/NGStreams/GNUmakefile +++ b/sope-core/NGStreams/GNUmakefile @@ -1,8 +1,6 @@ -# -# GNUmakefile -# -# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $ +# GNUstep makefile +-include ../../config.make include ../common.make include ./Version diff --git a/sope-core/samples/GNUmakefile b/sope-core/samples/GNUmakefile index 9062c37d..a6e2bd84 100644 --- a/sope-core/samples/GNUmakefile +++ b/sope-core/samples/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 9 2004-08-20 18:40:42Z helge $ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make TOOL_NAME = \ diff --git a/sope-gdl1/FrontBase2/GNUmakefile b/sope-gdl1/FrontBase2/GNUmakefile index a5d9aa1d..3ebbf73d 100644 --- a/sope-gdl1/FrontBase2/GNUmakefile +++ b/sope-gdl1/FrontBase2/GNUmakefile @@ -22,9 +22,8 @@ # If not, write to the Free Software Foundation, # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# $Id: GNUmakefile 1 2004-08-20 10:38:46Z znek $ - -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make +-include ../../config.make +include $(GNUSTEP_MAKEFILES)/common.make CAN_COMPILE_FB = \ $(shell ./cancompile.sh $(GNUSTEP_TARGET_CPU) $(GNUSTEP_TARGET_OS)) diff --git a/sope-gdl1/GDLAccess/GNUmakefile b/sope-gdl1/GDLAccess/GNUmakefile index 549b33d1..04c24e38 100644 --- a/sope-gdl1/GDLAccess/GNUmakefile +++ b/sope-gdl1/GDLAccess/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 1 2004-08-20 10:38:46Z znek $ +# GNUstep makefile +-include ../../config.make include ../common.make -include ./Version diff --git a/sope-gdl1/GNUmakefile b/sope-gdl1/GNUmakefile index 765061d1..8210f746 100644 --- a/sope-gdl1/GNUmakefile +++ b/sope-gdl1/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 1 2004-08-20 10:38:46Z znek $ +# GNUstep makefile +-include ../config.make include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=sope-gdl1 diff --git a/sope-gdl1/PostgreSQL/GNUmakefile b/sope-gdl1/PostgreSQL/GNUmakefile index ccc83eef..4214f56e 100644 --- a/sope-gdl1/PostgreSQL/GNUmakefile +++ b/sope-gdl1/PostgreSQL/GNUmakefile @@ -22,8 +22,7 @@ # If not, write to the Free Software Foundation, # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# $Id: GNUmakefile 1 2004-08-20 10:38:46Z znek $ - +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = PostgreSQL diff --git a/sope-ldap/GNUmakefile b/sope-ldap/GNUmakefile index 041b0ca1..1d22aaca 100644 --- a/sope-ldap/GNUmakefile +++ b/sope-ldap/GNUmakefile @@ -1,3 +1,6 @@ +# GNUstep makefile + +-include ../config.make include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=sope-ldap diff --git a/sope-ldap/NGLdap/ChangeLog b/sope-ldap/NGLdap/ChangeLog index 632d12ad..b9f39526 100644 --- a/sope-ldap/NGLdap/ChangeLog +++ b/sope-ldap/NGLdap/ChangeLog @@ -1,3 +1,7 @@ +2004-10-17 Helge Hess + + * GNUmakefile: include config.make if available (v4.3.21) + 2004-09-22 Marcus Mueller * README.macosx: removed obsoleted documentation diff --git a/sope-ldap/NGLdap/GNUmakefile b/sope-ldap/NGLdap/GNUmakefile index b0ed0737..f65884e9 100644 --- a/sope-ldap/NGLdap/GNUmakefile +++ b/sope-ldap/NGLdap/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 32 2004-08-21 00:50:30Z helge $ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make include ./Version diff --git a/sope-ldap/NGLdap/Version b/sope-ldap/NGLdap/Version index 475368f3..694a1f37 100644 --- a/sope-ldap/NGLdap/Version +++ b/sope-ldap/NGLdap/Version @@ -1,5 +1,5 @@ -# $Id: Version 13 2004-08-20 20:08:20Z helge $ +# Version file MAJOR_VERSION=4 MINOR_VERSION=3 -SUBMINOR_VERSION:=20 +SUBMINOR_VERSION:=21 diff --git a/sope-ldap/samples/GNUmakefile b/sope-ldap/samples/GNUmakefile index 6de6f0b5..bbf963fd 100644 --- a/sope-ldap/samples/GNUmakefile +++ b/sope-ldap/samples/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 13 2004-08-20 20:08:20Z helge $ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make TOOL_NAME = \ diff --git a/sope-mime/GNUmakefile b/sope-mime/GNUmakefile index a45bc2f0..1966c563 100644 --- a/sope-mime/GNUmakefile +++ b/sope-mime/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 32 2004-08-21 00:50:30Z helge $ +# GNUstep makefile +-include ../config.make include $(GNUSTEP_MAKEFILES)/common.make include ./Version diff --git a/sope-mime/NGImap4/GNUmakefile b/sope-mime/NGImap4/GNUmakefile index 67bd0fa5..83f6759c 100644 --- a/sope-mime/NGImap4/GNUmakefile +++ b/sope-mime/NGImap4/GNUmakefile @@ -1,3 +1,6 @@ +# GNUstep makefile + +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make SUBPROJECT_NAME = NGImap4 diff --git a/sope-mime/NGMail/GNUmakefile b/sope-mime/NGMail/GNUmakefile index ed54a602..a3845bb5 100644 --- a/sope-mime/NGMail/GNUmakefile +++ b/sope-mime/NGMail/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT) diff --git a/sope-mime/NGMime/GNUmakefile b/sope-mime/NGMime/GNUmakefile index 9f63d0d4..98f6ce6e 100644 --- a/sope-mime/NGMime/GNUmakefile +++ b/sope-mime/NGMime/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 9 2004-08-20 18:40:42Z helge $ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make include ../Version diff --git a/sope-mime/samples/GNUmakefile b/sope-mime/samples/GNUmakefile index b27c33f2..8eeceeb2 100644 --- a/sope-mime/samples/GNUmakefile +++ b/sope-mime/samples/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 9 2004-08-20 18:40:42Z helge $ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make TOOL_NAME = \ diff --git a/sope-xml/ChangeLog b/sope-xml/ChangeLog index 6569d4d1..e857d6dc 100644 --- a/sope-xml/ChangeLog +++ b/sope-xml/ChangeLog @@ -1,3 +1,7 @@ +2004-10-17 Helge Hess + + * all makefiles: include config.make if available + 2004-09-21 Marcus Mueller * sope-xml.xcode: Fixed dependencies to resemble the make process diff --git a/sope-xml/DOM/GNUmakefile b/sope-xml/DOM/GNUmakefile index 4ae6b2e1..73e4a057 100644 --- a/sope-xml/DOM/GNUmakefile +++ b/sope-xml/DOM/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $ +# GNUstep makefile +-include ../../config.make include ../common.make LIBRARY_NAME = libDOM diff --git a/sope-xml/GNUmakefile b/sope-xml/GNUmakefile index 61134514..a6af90e1 100644 --- a/sope-xml/GNUmakefile +++ b/sope-xml/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../config.make include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=sope-xml diff --git a/sope-xml/STXSaxDriver/GNUmakefile b/sope-xml/STXSaxDriver/GNUmakefile index ec1d7e53..9c556bd8 100644 --- a/sope-xml/STXSaxDriver/GNUmakefile +++ b/sope-xml/STXSaxDriver/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = STXSaxDriver diff --git a/sope-xml/SaxObjC/GNUmakefile b/sope-xml/SaxObjC/GNUmakefile index da1fe794..69ecf8d6 100644 --- a/sope-xml/SaxObjC/GNUmakefile +++ b/sope-xml/SaxObjC/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $ +# GNUstep makefile +-include ../../config.make include ../common.make LIBRARY_NAME = libSaxObjC diff --git a/sope-xml/XmlRpc/GNUmakefile b/sope-xml/XmlRpc/GNUmakefile index 342dae1d..6283f8a7 100644 --- a/sope-xml/XmlRpc/GNUmakefile +++ b/sope-xml/XmlRpc/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $ +# GNUstep makefile +-include ../../config.make include ../common.make LIBRARY_NAME = libXmlRpc diff --git a/sope-xml/libxmlSAXDriver/GNUmakefile b/sope-xml/libxmlSAXDriver/GNUmakefile index 0b193235..2d5ee472 100644 --- a/sope-xml/libxmlSAXDriver/GNUmakefile +++ b/sope-xml/libxmlSAXDriver/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = libxmlSAXDriver diff --git a/sope-xml/pyxSAXDriver/GNUmakefile b/sope-xml/pyxSAXDriver/GNUmakefile index 4ee51ff2..dfb95b32 100644 --- a/sope-xml/pyxSAXDriver/GNUmakefile +++ b/sope-xml/pyxSAXDriver/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = pyxSAXDriver diff --git a/sope-xml/samples/GNUmakefile b/sope-xml/samples/GNUmakefile index e18cdea6..9bf06d9d 100644 --- a/sope-xml/samples/GNUmakefile +++ b/sope-xml/samples/GNUmakefile @@ -1,5 +1,6 @@ # GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make TOOL_NAME = \ diff --git a/xmlrpc_call/GNUmakefile b/xmlrpc_call/GNUmakefile index ee17aa22..283bb550 100644 --- a/xmlrpc_call/GNUmakefile +++ b/xmlrpc_call/GNUmakefile @@ -1,5 +1,6 @@ # GNUstep makefile +-include ../config.make include $(GNUSTEP_MAKEFILES)/common.make include ../Version -- 2.39.5