Fixed distdef prefix handling and processing of non-source files

diff --git a/Makefile.am b/Makefile.am
index 9e604f661f5be79d790025e32a91be33847d15f6..02d4bde53fc47c789780ea334ff7bcc4842a115b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,3 @@
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
 SUBDIRS = apps
-
-EXTRA_DIST =           \
-       CHANGES CREDITS

diff --git a/apps/autodist/CHANGES b/apps/autodist/CHANGES
index c5468f8574f558205b16b6ebdab898bff458d161..1b0a7c3f79254d818d644034a76c6bbe1f74ab80 100644 (file)
--- a/apps/autodist/CHANGES
+++ b/apps/autodist/CHANGES
@@ -1,3 +1,10 @@
+Thu Jan  8 14:42:02 EET 2009 Pekka Riikonen <priikone@silcnet.org>
+
+       * Fixed distdef prefix in processing.  Uses correclty the
+         defined prefix now.
+
+       * Fixed finding of non-source files.
+
 Wed Jan 16 17:17:41 EET 2008 Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed *.ad (excluding configure.ad and Makefile.ad files)

diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in
index 9f2c8c6a7a9d31f10a13f351b2fd8cd4ef119c5b..b4c1d864296bf6c3e564fb5df326995783ff2cb4 100755 (executable)
--- a/apps/autodist/autodist.in
+++ b/apps/autodist/autodist.in
@@ -836,9 +836,9 @@ ad_process_tree()
        \! -name \*\.[cC][pP][pP] -a \
        \! -name \*\.[cC]++ -a \
        \! -name \*\.m -a \
-       \! -name \*\.mm -o \
-       \! -name \*\.M -o \
-       \! -name \*\.S -o \
+       \! -name \*\.mm -a \
+       \! -name \*\.M -a \
+       \! -name \*\.S -a \
        \! -name \*\.[hH] -a \
        \! -name \*\.hh -a \
        \! -name \*\.[cC]\.in -a \
@@ -1548,11 +1548,11 @@ ad_process_file()
   fi
 
   # Get defined distribution defines
-  defs=`awk "/^#ifdef "$DP"_DIST_|^#else "$DP"_DIST_/ { print; }" \
+  defs=`awk "/^#ifdef ${DP}_DIST_|^#else ${DP}_DIST_/ { print; }" \
     $1 |cut -d'*' -f2 |cut -d' ' -f2 | sort | uniq`
 
   # Get explicitly not-defined distribution defines
-  ndefs=`awk "/^#ifndef "$DP"_DIST_|^#else !"$DP"_DIST_/ { print; }" \
+  ndefs=`awk "/^#ifndef ${DP}_DIST_|^#else !${DP}_DIST_/ { print; }" \
     $1 |cut -d'*' -f2 |cut -d' ' -f2 | cut -d'!' -f2 | sort | uniq`
 
   ad_debug "defs in $1: $defs"
@@ -1659,11 +1659,11 @@ ad_process_source_file()
   fi
 
   # Get defined distribution defines
-  defs=`awk '/^#ifdef SILC_DIST_|^#else \/\* SILC_DIST_/ { print; }' \
+  defs=`awk "/^#ifdef ${DP}_DIST_|^#else \/\* ${DP}_DIST_/ { print; }" \
     $1 |cut -d'*' -f2 |cut -d' ' -f2 | sort | uniq`
 
   # Get explicitly not-defined distribution defines
-  ndefs=`awk '/^#ifndef SILC_DIST_|^#else \/\* \!SILC_DIST_/ { print; }' \
+  ndefs=`awk "/^#ifndef ${DP}_DIST_|^#else \/\* \!${DP}_DIST_/ { print; }" \
     $1 |cut -d'*' -f2 |cut -d' ' -f2 | cut -d'!' -f2 | sort | uniq`
 
   ad_debug "defs in $1: $defs"
@@ -1723,7 +1723,7 @@ ad_process_source_file()
 
     # Those distdef lines that remain in the file are removed to make
     # the appearance prettier
-    echo "/^#ifdef SILC_DIST_|^#endif \/\* SILC_DIST_|^#else \/\* SILC_DIST_|^#else \/\* \!SILC_DIST_|^#ifndef SILC_DIST_/ { next; }" >> $f
+    echo "/^#ifdef "$DP"_DIST_|^#endif \/\* "$DP"_DIST_|^#else \/\* "$DP"_DIST_|^#else \/\* \!"$DP"_DIST_|^#ifndef "$DP"_DIST_/ { next; }" >> $f
     echo "{ print; }" >> $f
 
     # Execute the script

diff --git a/apps/autodist/doc/autodist.texi b/apps/autodist/doc/autodist.texi
index d6964ec0860737e3601b0470aae800513a2490f9..3d8c29268d950f47ec207842b3966652dcdf1b23 100644 (file)
--- a/apps/autodist/doc/autodist.texi
+++ b/apps/autodist/doc/autodist.texi
@@ -49,7 +49,7 @@ level, and automatic relicensing of a distribution.
 * Integrating Autodist::        Integrating Autodist into your project
 * Invoking Autodist::           Running Autodist
 * Examples::                    Examples using Autodist
-* Download::                   Download Autodist @url{http://silcnet.org/download/autodist/, Autodist @value{VERSION}}
+* Download::                   Download @url{http://silcnet.org/download/autodist/, Autodist @value{VERSION}}
 
 @detailmenu
 Introduction