Move duplicated code into function func_modules_to_filelist().

diff --git a/ChangeLog b/ChangeLog
index cc43fe04b114bd5de5f0b79f271daf768841c1c5..a925976f0e964b22b80b6b33ae1f30938a6ca99f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,13 @@
 
        * gnulib-tool: Untabify. Initialize supplied_libname.
        (func_usage): More homogenous output.
-       (func_modules_transitive_closure): New function.
+       (func_modules_transitive_closure, func_modules_to_filelist): New
+       functions.
        (func_import): New function, extracted from big case statement. Use
-       func_get_license, func_modules_transitive_closure.
-       (func_create_testdir): Use func_modules_transitive_closure.
+       func_get_license, func_modules_transitive_closure,
+       func_modules_to_filelist.
+       (func_create_testdir): Use func_modules_transitive_closure,
+       func_modules_to_filelist.
 
 2004-10-11  Bruno Haible  <bruno@clisp.org>
 

diff --git a/gnulib-tool b/gnulib-tool
index 842016faa1b5a1faef920c4c7ef945b387d4e257..a55cfdcad8a51acf58eb14b673915a4cad3e8248 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2004-10-15 15:37:43 $'
+cvsdatestamp='$Date: 2004-10-15 15:40:45 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -385,6 +385,23 @@ func_modules_transitive_closure ()
   done
 }
 
+# func_modules_to_filelist
+# Input:
+# - modules         list of modules, including dependencies
+# Output:
+# - files           list of files
+func_modules_to_filelist ()
+{
+  files=
+  for module in $modules; do
+    func_verify_module
+    if test -n "$module"; then
+      files="$files "`func_get_filelist $module`
+    fi
+  done
+  files=`for f in $files; do echo $f; done | sort | uniq`
+}
+
 # func_import modules
 # Uses also the variables
 # - destdir         target directory
@@ -415,14 +432,7 @@ func_import ()
   fi
 
   # Determine final file list.
-  files=
-  for module in $modules; do
-    func_verify_module
-    if test -n "$module"; then
-      files="$files "`func_get_filelist $module`
-    fi
-  done
-  files=`for f in $files; do echo $f; done | sort | uniq`
+  func_modules_to_filelist
   echo "File list:"
   echo "$files" | sed -e 's/^/  /'
 
@@ -591,14 +601,7 @@ func_create_testdir ()
   echo "$modules" | sed -e 's/^/  /'
 
   # Determine final file list.
-  files=
-  for module in $modules; do
-    func_verify_module
-    if test -n "$module"; then
-      files="$files "`func_get_filelist $module`
-    fi
-  done
-  files=`for f in $files; do echo $f; done | sort | uniq`
+  func_modules_to_filelist
   echo "File list:"
   echo "$files" | sed -e 's/^/  /'