From: Pekka Riikonen <priikone@silcnet.org>
Date: Sun, 1 May 2005 14:48:34 +0000 (+0000)
Subject: 	Added dependency support for configure.ad files too.
X-Git-Tag: autodist.1.3~14
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=2d71ffafb8f16e6734ab424bad2ae6935559a701;p=silc.git

	Added dependency support for configure.ad files too.
---

diff --git a/apps/autodist/CHANGES b/apps/autodist/CHANGES
index 2c5228ce..c12239a9 100644
--- a/apps/autodist/CHANGES
+++ b/apps/autodist/CHANGES
@@ -1,4 +1,4 @@
-Sun May  1 12:31:55 EEST 2005 Pekka Riikonen <priikone@silcnet.org>
+Sun May  1 17:31:55 EEST 2005 Pekka Riikonen <priikone@silcnet.org>
 
 	* Added support for dependencies in makefiles.
 
@@ -9,6 +9,8 @@ Sun May  1 12:31:55 EEST 2005 Pekka Riikonen <priikone@silcnet.org>
 	* Added -p option to Autodist.  It can be used to a process file
 	  from the command line.
 
+	* Added dependency support for configure.ad files as well.
+
 Sat Apr 30 17:49:05 EEST 2005 Pekka Riikonen <priikone@silcnet.org>
 
 	* The 'noprocess' directive now works recursively with
diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in
index 2e600820..85f36d9d 100755
--- a/apps/autodist/autodist.in
+++ b/apps/autodist/autodist.in
@@ -529,11 +529,17 @@ EOF
 
   # Enable dependencies if requested
   if test x$am_deps = xtrue; then
+    # Get list of configure.ad's to get them into deps also
+    cfs=`find . -type f -name configure\*\.ad`
+    cfs=`echo $cfs | sed 's/\.\///g'`
+
     cat >> $fname <<EOF
 
 # S_AD_ENABLE_DEPENDENCIES
 \$(srcdir)/Makefile.am: Makefile.ad
 	cd \$(top_srcdir) && autodist -p makefile \$(subdir)/Makefile.ad \$(subdir)/Makefile.am && cd \$(subdir)
+\$(srcdir)/configure.ac: $cfs
+	cd \$(top_srcdir) && autodist -p configure \$(top_srcdir)/configure.ad && cd \$(subdir)
 # E_AD_ENABLE_DEPENDENCIES
 EOF
   fi
diff --git a/apps/autodist/doc/autodist.texi b/apps/autodist/doc/autodist.texi
index 2d2cd573..a054dac7 100644
--- a/apps/autodist/doc/autodist.texi
+++ b/apps/autodist/doc/autodist.texi
@@ -80,6 +80,7 @@ Integrating Autodist
 * Makefile.ad files::           Makefile.ad for creating Makefile.am
 * Other .ad files::             Other files with .ad suffix
 * Distdefines::                 Using distdefs in files
+* Dependencies::                Autodist dependency support
 
 Invoking Autodist
 
@@ -240,6 +241,7 @@ as they may not exist yet.
 * Makefile.ad files::           Makefile.ad for creating Makefile.am
 * Other .ad files::             Other files with .ad suffix
 * Distdefines::                 Using distdefs in files
+* Dependencies::                Autodist dependency support
 @end menu
 
 
@@ -1025,18 +1027,16 @@ configure scripts.  They must not use 'AD_INIT', 'AD_INCLUDE_CONFIGURE',
 
 @defmac AD_DISABLE_DEPENDENCIES
 
-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.
+This macro is used to disable Autodist dependencies.  If this macro is
+used, then after editing 'Makefile.ad' and 'configure.ad' files the
+Autodist must be run manually.  When dependencies are enabled 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 
-presence of 'Makefile.ad' files, which are not delivered to distribution. 
-
-Current Autodist version does not support dependencies in 'configure.ad' 
-files, only in 'Makefile.ad' files.
+presence of 'Makefile.ad' and 'configure.ad' files, which are not 
+delivered to distribution.
 @end defmac
 
 @menu
@@ -1289,6 +1289,28 @@ Example:
 In this example, in both of the files the source code format is used.
 
 
+@node Dependencies
+@section Autodist dependency support
+
+Autodist support dependencies for 'Makefile.ad' and 'configure.ad' files.  
+When these files are edited, they are processed by Autodist automatically 
+when the source tree is compiled with 'make'.  This makes development in 
+the source tree easier, when Autodist does not have to be run manually.
+The dependencies can be disabled by using 'AD_DISABLE_DEPENDENCIES' macro 
+in the 'configure.ad' file.
+
+When editing 'configure.ad' fragments the modifcation is detected when the 
+source tree is compiled with 'make' from the top source directory.  
+Giving 'make' in a subdirectory will not detect a change in 'configure.ad' 
+fragment.
+
+Dependencies are present only in the prepared source tree.  They are not 
+delivered to created distribution, as they depend on 'Makefile.ad' and 
+'configure.ad' files which are not present in the created distribution.  
+Autodist automatically removes the dependencies when the distribution is 
+created.
+
+
 @node Invoking Autodist
 @chapter Invoking Autodist