Fixed *.ad (not configure.ad or Makefile.ad but other files)

[runtime.git] / apps / autodist / autodist.in

diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in
index bac46d50b4caf483cca4fdc1cf8ca79edae2f66a..3154d5ffaceb7afe0fbbb83c097bed4caa240fdf 100755 (executable)
--- a/apps/autodist/autodist.in
+++ b/apps/autodist/autodist.in
@@ -565,16 +565,22 @@ ad_process_ads()
   for i in $files
   do
     fname=`echo $i | sed s/\.ad//`
+    orig=$i
 
     ad_debug "Processing $i to be $fname"
     ad_log "  $i into $fname"
 
     # Run the distribution processing for this file
-    ad_process_file $i $fname false
-    if test -f $fname; then
-      cp -p $i $fname || exit 1
+    ad_process_file $i $fname.tmp false
+
+    # Remove any trailing backslashes
+    if test -f "$fname.tmp"; then
+      sed -e :a -e '/\\$/N; s/[        ]*\\\n//; ta' < $fname.tmp > $fname
+    else
+      cp -p $orig $fname || exit 1
     fi
 
+    rm -f $fname.tmp
   done
   ad_log ""
 
@@ -833,6 +839,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 \*\.[hH] -a \
        \! -name \*\.hh -a \
        \! -name \*\.[cC]\.in -a \
@@ -885,10 +894,6 @@ ad_process_source_tree()
        -name \*\.mm -o \
        -name \*\.M -o \
        -name \*\.S -o \
-       -name \*\.F -o \
-       -name \*\.F90 -o \
-       -name \*\.F95 -o \
-       -name \*\.[fF][pP][pP] -o \
        -name \*\.[hH] -o \
        -name \*\.hh -o \
        -name \*\.[cC]\.in -o \