.in with source files expect source code format for distdefs.

diff --git a/apps/autodist/CHANGES b/apps/autodist/CHANGES
index aabe59437471de3f483b083a23b1ecd815235cd5..37571907b1fd0f39e48a5303664d17dc5d4f890d 100644 (file)
--- a/apps/autodist/CHANGES
+++ b/apps/autodist/CHANGES
@@ -1,3 +1,8 @@
+Thu Apr 28 11:44:59 EEST 2005 Pekka Riikonen <priikone@silcnet.org>
+
+       * The '.in' suffix with source file suffixes expects source code 
+         format for the distdefs.
+
 Sun Apr 24 21:11:49 EEST 2005 Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed undefining to actually work.

diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in
index 162547ffb485ae642005702fd03f4e6cd5cff0bd..9740828591bfd6c3eaf25c156dc8695227db0c9a 100755 (executable)
--- a/apps/autodist/autodist.in
+++ b/apps/autodist/autodist.in
@@ -697,7 +697,15 @@ ad_process_tree()
        \! -name \*\.[cC]++ -a \
        \! -name \*\.m -a \
        \! -name \*\.[hH] -a \
-       \! -name \*\.hh \)`
+       \! -name \*\.hh -a \
+       \! -name \*\.[cC]\.in -a \
+       \! -name \*\.[cC][cCpP]\.in -a \
+       \! -name \*\.[cC][xX][xX]\.in -a \
+       \! -name \*\.[cC][pP][pP]\.in -a \
+       \! -name \*\.[cC]++\.in -a \
+       \! -name \*\.m\.in -a \
+       \! -name \*\.[hH]\.in -a \
+       \! -name \*\.hh\.in \)`
   files=`echo $files | sed 's/$am_distdir//'`
 
   # Take away noprocess list
@@ -742,7 +750,15 @@ ad_process_source_tree()
        -name \*\.[cC]++ -o \
        -name \*\.m -o \
        -name \*\.[hH] -o \
-       -name \*\.hh \)`
+       -name \*\.hh -o \
+       -name \*\.[cC]\.in -o \
+       -name \*\.[cC][cCpP]\.in -o \
+       -name \*\.[cC][xX][xX]\.in -o \
+       -name \*\.[cC][pP][pP]\.in -o \
+       -name \*\.[cC]++\.in -o \
+       -name \*\.m\.in -o \
+       -name \*\.[hH]\.in -o \
+       -name \*\.hh\.in \)`
 
   # Take away noprocess list
   if test -f autodist.noprocess; then

diff --git a/apps/autodist/doc/autodist.texi b/apps/autodist/doc/autodist.texi
index 393eb6a2b542dcf697878ca663af71ed2a9853a9..577db0ae8bfcd06b45fc9c5e2711f150bf372d1c 100644 (file)
--- a/apps/autodist/doc/autodist.texi
+++ b/apps/autodist/doc/autodist.texi
@@ -1066,7 +1066,9 @@ If you need processed files during configuration or compilation then they
 need to have '.ad' suffix.
 
 Note that, the distdef format used in these files must be the non-source
-format.
+format, even if the file is source file.  This is because the distdefs
+are processed during source tree preparation, and the source file will
+have all distdefs removed when it is compiled.
 
 @menu
 * Distdefines::                 Using distdefs in files
@@ -1256,8 +1258,18 @@ The following suffixes will be considered as source files by the Autodist:
     .hh
 @end example
 
+Also, any file that has '.in' suffix with any of the above source file 
+suffixes, the format inside the file must follow the source code format.  
 Using distdefs in any other file must follow the non-source format.
 
+Example:
+@example
+    .c.in
+    .h.in
+@end example
+
+In this example, in both of the files the source code format is used.
+
 
 @node Invoking Autodist
 @chapter Invoking Autodist