include config.make in makefiles

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

diff --git a/GNUmakefile b/GNUmakefile
index 4861531f168162fdab65ff1430504164f01b896e..f85f2c0df74899619ca8af29b9258c6d150ed219 100644 (file)
--- 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 ba11180548508556cc3c3d51f81cbf199b795dc9..2fb919192e6630a8fc679bdd14a8972f2625ab9b 100755 (executable)
--- 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 a2f05030f6bfc07be41b9e956ccd440c4a447076..89e3e12dbbe7bc87323196371e114e54bc299a49 100644 (file)
--- 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 0ae0306dbebc0eaa4560a2fac03f29054579eff6..9614f2d7ef8e26797cf0780ae0d3b6a521afbcf0 100644 (file)
--- 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 a106f8b1707d877814638a44c47206b822a7d8ea..542ae2a265340ee4c3e30579db9afea417e7064f 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-17  Helge Hess  <helge.hess@opengroupware.org>
+
+       * include config.make if available (v4.3.67)
+
 2004-10-16  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * NGObjWeb.xcode: added WOxTagClassElemBuilder.m and

diff --git a/sope-appserver/NGObjWeb/DynamicElements/GNUmakefile b/sope-appserver/NGObjWeb/DynamicElements/GNUmakefile
index 295a9a2f45634b80ca2b3441a0fef58c2f66679b..268d3785bb6619af5b5fd6a6cd409d7f81aac6a0 100644 (file)
--- 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 6b122734969264c9a2115d224b4f6d0b786e84d4..f7a123f02cb57081ed791a5a157477e71c20cd93 100644 (file)
--- 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 7fb02d876a979cc52202731353b0cbaaaaff2e51..2f98be4940d3cdc9ea471011367a0f24acfef079 100644 (file)
--- 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 0f2ba6f1e4b629f0c3e3d2d663a13fec2beae02d..e5b26b24456cb141016f0b6d7c7c7e6e0ab147db 100644 (file)
--- 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 a64e148f6bc2f0e95e8ff77590c178e5fc27ee96..be65cb63570c4c1bd860a7e49e13569011f292e2 100644 (file)
--- 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 169c13e0eaa2d91415fca0d8285e0959683fa5bf..a147ab14108a39d9b4c021aad276b7665c3a9dd4 100644 (file)
--- 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 1560a15f931185a6bb557b6deaa0c6de853ab866..a66bdb1b5994d8b0e8469e6604145492030431a9 100644 (file)
--- 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 9ed6baa6956641fdafd0f92c9a4f3813896356a6..914b4beffc4e1cc59e5f11a20a283ce1b64131ff 100644 (file)
--- 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 5b4c75a8d0f9ca20e1879570ed50b6c4afa999ee..1effd5054e124db05fafca990a9d4cd825c64d3c 100644 (file)
--- 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 a1b1893a674f443e62e9e5a7907cd8fc91053d34..a581b9a3ec028c246bbd91aba9dd65dc9c6f5ada 100644 (file)
--- 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 0ca4b0c680fb54df3a22611b32db92905dd8c6f4..490b2c18f8ac7bd6eb6e377873b0c47dc504de12 100644 (file)
--- 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 fc181b0dbcba3fbc0ec5d3f61ebf38131ce6da19..bb8baed69b409656ab6d2b30085d69b43c55d40c 100644 (file)
--- 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 8e3bfd8939e1307e545dc8db8bcae05cf932b2fb..87ada9d42a7f904663c1128cb9f74ce77fab4067 100644 (file)
--- 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 0a7252132eea5923c282afd7b8086f567d980158..869b4dc9740c8ae4abb0ad4527241d61e5447372 100644 (file)
--- 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 59c11b7a8e847abac8f53d045b22625c18a4a996..4803c916e64b84f707d55b623293962f7f95ff0c 100644 (file)
--- 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 7581d3274f2a41cd2c3411fb05c7a3d404ba71a8..daee1af5c8a9c24befc20f84fae729903a2b8d83 100644 (file)
--- 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 6607c5c4b99f41c6185c52b4efb7f3764dfa68a3..357478848bdf048590e652ebd6b9559bc8a8fc5e 100644 (file)
--- 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 b667beeccdf094e4427341c0e3873d9fceacc206..9e433ce074915d66a05c60053f895cf9a95a77a9 100644 (file)
--- 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 519fa249a83936abf03b39a7f50182f128a2f79b..90268128764e05055807868ef6d7171c3df1110c 100644 (file)
--- 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 20a065d04f65d2894bbd070fd0bef3ccec998fdd..744bb7687848e3f3a7c368365259e12e5c5d9b6e 100644 (file)
--- 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 1ad78c2b19c0cf693ff61ff254085bafbc74bbba..c3922761789ed130db09b0b6df091317fb458417 100644 (file)
--- 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 9229af10af0c1d6520ac3132f4b6b6e47bdb0457..b59a1223a83c3a87f56a823c086d67138157d005 100644 (file)
--- a/sope-core/ChangeLog
+++ b/sope-core/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-17  Helge Hess  <helge.hess@opengroupware.org>
+
+       * all makefiles: include config.make if available
+
 2004-09-22  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * sope-core.xcode: Fixed wrong build order

diff --git a/sope-core/EOControl/GNUmakefile b/sope-core/EOControl/GNUmakefile
index cf632f3efbe1197b1ec3edba963fad6d479b696a..aa6c8b5e27c27f0d4d3ffba4b2f96c55f5cf9049 100644 (file)
--- 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 7f58da2c8fc3ebf09a19b71a0bc02b2c0ce58228..63b3c21f7f7505cd04e5873a8e4de64bb0ba10b1 100644 (file)
--- 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 7564fddc4052d57b5225a8777a25472a169394c3..860c8302cea2aff0efebd41d8198e7861570643c 100644 (file)
--- 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 bfc4e16270afd7a8a3b086f0502060aeee96b163..82e1db2b2d09137595a986c2b7f36de812e2a3dd 100644 (file)
--- 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 e1c476bc969e4764cd3ebcf92f5971f9725458f1..177a82a7875c0a2e1e00838652c5c0dc46d33ed8 100644 (file)
--- 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 5f466eca8047c751ed782c60907bcfce3863fc2b..c18cb0d37f312e9783cbb9b8d9061d81f48813f9 100644 (file)
--- 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 988909bcbc59861c1bfec0a3e0ebd0cbc28cc8e1..cad5a45d107fb3c1f5bd565bc9da765a6bbad131 100644 (file)
--- 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 93702e5878cc3b95af683607e78baba1531fdf83..000ea070b2d1e4a96373c1594fd5d4202c79e9c7 100644 (file)
--- 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 9062c37d470318b03942f5954f196f3f66629a72..a6e2bd84c40b155e0b2cd7ea252b90ec3bc9ef61 100644 (file)
--- 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 a5d9aa1dba4d150689fea01047cc2428495b47d0..3ebbf73d25333fdd2a17c8dd0672ae4f47f16cbd 100644 (file)
--- 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 549b33d1c302672cf00fd15d1297c073dd622b0d..04c24e38d634d6a517703433671dad8098255bc6 100644 (file)
--- 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 765061d1acb6071b949e02456d3560ff3f463bfb..8210f74639a910a70019468e1348bcc52856aefc 100644 (file)
--- 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 ccc83eeff86bdadbd0cf375f660366271eb0a552..4214f56e1a4cd75dcc4421e4ddcc941553ecb258 100644 (file)
--- 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 041b0ca199d540184839b1afd568e2a676f55e0e..1d22aaca349b4a3b6dfa88e3304ee0e22f92449f 100644 (file)
--- 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 632d12ad6b8d76adf79801625aff5a16e605b74b..b9f39526bfb61aff406f8e9b03aa27639735f88f 100644 (file)
--- a/sope-ldap/NGLdap/ChangeLog
+++ b/sope-ldap/NGLdap/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-17  Helge Hess  <helge.hess@opengroupware.org>
+
+       * GNUmakefile: include config.make if available (v4.3.21)
+
 2004-09-22  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * README.macosx: removed obsoleted documentation

diff --git a/sope-ldap/NGLdap/GNUmakefile b/sope-ldap/NGLdap/GNUmakefile
index b0ed0737fba991c5253481f94889093e399333d0..f65884e9360cd6436083ca25569747dedda0eece 100644 (file)
--- 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 475368f352f44fbc9d2f650780f4eaabb6404a6f..694a1f3736d163ff26d4c876fdeffb9341c59339 100644 (file)
--- 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 6de6f0b519ff5a8e2b8239753a2076ef9eb8cdff..bbf963fdc55844298abae0d5238c9085f540816b 100644 (file)
--- 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 a45bc2f001e358887d65159954aea965153ebcad..1966c563b57a6e1a6752b84a5c61620fbc52dd40 100644 (file)
--- 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 67bd0fa5b1d48d405d051576d24b41bc4f7be1d5..83f6759c8945061f6f8a24d25e0811039b882a08 100644 (file)
--- 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 ed54a602a3a5612708b66a70f09990827485e128..a3845bb54d452671bdd3628790f7804572114271 100644 (file)
--- 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 9f63d0d4e7ff369325dd9bd1a044bcdd441c5e9b..98f6ce6e9719de4f4673da79500fdd33edea1783 100644 (file)
--- 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 b27c33f293ec0f72e31f2996383f23e662ff1275..8eeceeb2c5f0eafa5b9810a1148deb1481f5921e 100644 (file)
--- 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 6569d4d1dff9c1368dcb9e70f6db32867155cd04..e857d6dc40646fa3a39bf92fdfde7c3a40b9532f 100644 (file)
--- a/sope-xml/ChangeLog
+++ b/sope-xml/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-17  Helge Hess  <helge.hess@opengroupware.org>
+
+       * all makefiles: include config.make if available
+
 2004-09-21  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * sope-xml.xcode: Fixed dependencies to resemble the make process

diff --git a/sope-xml/DOM/GNUmakefile b/sope-xml/DOM/GNUmakefile
index 4ae6b2e19a9bb9cfedf62349e0bd08893df83d9d..73e4a0574debd56b91352467434c6d2217cb9042 100644 (file)
--- 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 61134514ce89f3b2ceadeaf6d19d71285215ba6a..a6af90e12756b8c2a02c898622a73bcb2afea159 100644 (file)
--- 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 ec1d7e53bdf18cf037184ff50ec098c168bcea92..9c556bd87972bc187076b74080e3be8e1cbec64f 100644 (file)
--- 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 da1fe79454c5dd6c2ad4709b2c016cda110103f7..69ecf8d6f0c49be6ebab8f2b6d5e4d5614d666a9 100644 (file)
--- 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 342dae1dc06c2f7bc7c7f6a2899ebd6dc8f7a5fd..6283f8a7734e43749bee01f6a1e1dc07fa5cda67 100644 (file)
--- 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 0b193235afb7bbb38376ba487464c1209e217a78..2d5ee47258267112b1507328f3808148bd4b36dd 100644 (file)
--- 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 4ee51ff26a914ca6f0d34f16fba1a7252b0c42fb..dfb95b32af82a5e227d9e3dca372d32f0b525298 100644 (file)
--- 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 e18cdea6e3c644ca6f8f6d93847ff26b465400c1..9bf06d9d8f2dc2a2164cb60d40a7a44806c7fd98 100644 (file)
--- 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 ee17aa22dbc7c458fab701af07218ef973a29d2a..283bb550d8947be9cf676ec5d1c840a835314a20 100644 (file)
--- a/xmlrpc_call/GNUmakefile
+++ b/xmlrpc_call/GNUmakefile
@@ -1,5 +1,6 @@
 # GNUstep makefile
 
+-include ../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../Version