AD_ENABLE_DEPENDENCIES -> AD_DISABLE_DEPENDENCIES.

diff --git a/apps/autodist/CHANGES b/apps/autodist/CHANGES
index 959fe07e0d5920861eba13a915d2eb2fce08a7c5..2c5228ce31338dccdf32ae958495d44bbd89eb7e 100644 (file)
--- a/apps/autodist/CHANGES
+++ b/apps/autodist/CHANGES
@@ -1,7 +1,10 @@
 Sun May  1 12:31:55 EEST 2005 Pekka Riikonen <priikone@silcnet.org>
 
-       * Added AD_ENABLE_DEPENDENCIES macro to enable Autodist
-         dependencies in makefiles.
+       * Added support for dependencies in makefiles.
+
+       * Added AD_DISABLE_DEPENDENCIES macro to disable Autodist
+         dependencies in makefiles.  Added support for dependencies
+         in makefiles.
 
        * Added -p option to Autodist.  It can be used to a process file
          from the command line.

diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in
index c18051dd3a6c7eb39aa038cea7e55dc368a3dd57..e95fc80f7912984ae248ac69761fd91ef6426da9 100755 (executable)
--- a/apps/autodist/autodist.in
+++ b/apps/autodist/autodist.in
@@ -418,8 +418,8 @@ EOF
   # Process AD_INIT
   sed -e "/AD_INIT/s//AC_INIT([$distribution], [$dist_version], [$bug_report], [$package])/" $fname > $fname.tmp
 
-  # Remove AD_ENABLE_DEPENDENCIES
-  sed -e "/^AD_ENABLE_DEPENDENCIES/d" $fname.tmp > $fname
+  # Remove AD_DISABLE_DEPENDENCIES
+  sed -e "/^AD_DISABLE_DEPENDENCIES/d" $fname.tmp > $fname
 
   # Process for distribution
   rm -f $fname.tmp
@@ -493,15 +493,15 @@ ad_make_makefile_ams()
 #
 ad_make_makefile_am()
 {
-  local am_deps=false
+  local am_deps=true
   local f=$1
   local fname=$2
 
-  # Enable dependencies if requested
+  # Disable dependencies if requested
   dc=`sed 's/^[        ]*//' < configure.ad | grep -v "^#" \
-    | grep "AD_ENABLE_DEPENDENCIES"`
-  if test "$dc" = "AD_ENABLE_DEPENDENCIES"; then
-    am_deps=true
+    | grep "AD_DISABLE_DEPENDENCIES"`
+  if test "$dc" = "AD_DISABLE_DEPENDENCIES"; then
+    am_deps=false
   fi
 
   # Header for the Makefile.am

diff --git a/apps/autodist/doc/autodist.texi b/apps/autodist/doc/autodist.texi
index c167a0eb10fb9afae2c929ffe84c3b1345762bd0..3cc7f19d979f44bf6d5b2179e5bc76de4a100b4b 100644 (file)
--- a/apps/autodist/doc/autodist.texi
+++ b/apps/autodist/doc/autodist.texi
@@ -1023,12 +1023,13 @@ configure scripts.  They must not use 'AD_INIT', 'AD_INCLUDE_CONFIGURE',
 @end defmac
 
 
-@defmac AD_ENABLE_DEPENDENCIES
+@defmac AD_DISABLE_DEPENDENCIES
 
-This macro is used to enable Autodist dependencies in 'Makefile.ad' files.  
-If this macro is used, then after editing 'Makefile.ad' file running 
-Autodist manually is not required, but it is run automatically when the 
-source is compiled with 'make'.  This macro has no arguments.
+This macro is used to disable Autodist dependencies in 'Makefile.ad' 
+files.  If this macro is used, then after editing 'Makefile.ad' file the 
+Autodist must be run manually.  When dependencies are enabled editing 
+Autodist is run automatically when source is compiled with 'make'. 
+Dependencies make the development easier.  This macro has no arguments.
 
 Note that, the dependencies are enabled only in the prepared source tree.  
 Depedencies are not delivered to distribution, as they would require the