Move duplicated code into function func_emit_lib_Makefile_am().

diff --git a/ChangeLog b/ChangeLog
index 217601621bb005b1f21cf10f641e373eab5e1772..a2e6e794fc5ef61d9997ec43e6a58659690f1e8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,14 +2,14 @@
 
        * gnulib-tool: Untabify. Initialize supplied_libname.
        (func_usage): More homogenous output.
-       (func_modules_transitive_closure, func_modules_to_filelist): New
-       functions.
+       (func_modules_transitive_closure, func_modules_to_filelist,
+       func_emit_lib_Makefile_am): New functions.
        (func_import): New function, extracted from big case statement. Use
        func_get_license, func_modules_transitive_closure,
-       func_modules_to_filelist. Initialize opt_lgpl. Don't use test -a, as
-       it's not portable.
+       func_modules_to_filelist, func_emit_lib_Makefile_am. Initialize
+       opt_lgpl. Don't use test -a, as it's not portable.
        (func_create_testdir): Use func_modules_transitive_closure,
-       func_modules_to_filelist.
+       func_modules_to_filelist, func_emit_lib_Makefile_am.
 
 2004-10-11  Bruno Haible  <bruno@clisp.org>
 

diff --git a/gnulib-tool b/gnulib-tool
index eb7d853fe858c5e25bd7d4a040d06f70bf4f59ff..40e9efe299abb20761b90ec83ab1871326779fa0 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2004-10-15 15:46:41 $'
+cvsdatestamp='$Date: 2004-10-15 16:45:28 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -402,12 +402,72 @@ func_modules_to_filelist ()
   files=`for f in $files; do echo $f; done | sort | uniq`
 }
 
+# func_emit_lib_Makefile_am
+# emits the contents of lib/Makefile.am to standard output.
+# Input:
+# - modules         list of modules, including dependencies
+# - libname         library name
+# - libtool         true if libtool will be used, blank otherwise
+# - cmd             (optional) command that led to this invocation
+# - actioncmd       (optional) command that will reproduce this invocation
+func_emit_lib_Makefile_am ()
+{
+  if test -n "$libtool"; then
+    libext=la
+    perhapsLT=LT
+  else
+    libext=a
+    perhapsLT=
+  fi
+  echo "## Process this file with automake to produce Makefile.in."
+  echo "# Copyright (C) 2004 Free Software Foundation, Inc."
+  echo "#"
+  echo "# This file is free software, distributed under the terms of the GNU"
+  echo "# General Public License.  As a special exception to the GNU General"
+  echo "# Public License, this file may be distributed as part of a program"
+  echo "# that contains a configuration script generated by Automake, under"
+  echo "# the same distribution terms as the rest of that program."
+  echo "#"
+  echo "# Generated by gnulib-tool."
+  if test -n "$cmd"; then
+    echo "# Invoked as: $cmd"
+  fi
+  if test -n "$actioncmd"; then
+    echo "# Reproduce by: $actioncmd"
+  fi
+  echo
+  # No need to generate dependencies since the sources are in gnulib, not here.
+  echo "AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies"
+  echo
+  echo "noinst_${perhapsLT}LIBRARIES = $libname.$libext"
+  echo
+  echo "${libname}_${libext}_SOURCES ="
+  echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@"
+  echo "EXTRA_DIST ="
+  echo "BUILT_SOURCES ="
+  echo "SUFFIXES ="
+  echo "MOSTLYCLEANFILES ="
+  echo "CLEANFILES ="
+  echo "DISTCLEANFILES ="
+  echo "MAINTAINERCLEANFILES ="
+  for module in $modules; do
+    func_verify_module
+    if test -n "$module"; then
+      func_get_automake_snippet "$module" | sed -e "s,lib_SOURCES,$libname"'_a_SOURCES,g' -e "s,lib_OBJECTS,$libname"'_a_OBJECTS,g'
+      if test "$module" = 'alloca'; then
+        echo "${libname}_${libext}_LIBADD += @{perhapsLT}ALLOCA@"
+      fi
+    fi
+  done
+}
+
 # func_import modules
 # Uses also the variables
 # - destdir         target directory
 # - libname         library name
 # - sourcebase      directory relative to destdir where to place source code
 # - m4base          directory relative to destdir where to place *.m4 macros
+# - libtool         true if libtool will be used, blank otherwise
 # - lgpl            true if library's license shall be LGPL, blank otherwise
 # - dry_run         true if actions shall only be printed, blank otherwise
 # - supplied_opts   all options passed to gnulib-tool
@@ -472,58 +532,14 @@ func_import ()
 
   # Create lib/Makefile.am.
   echo "Creating $destdir/$sourcebase/Makefile.am..."
-  if test -n "$libtool"; then
-    libext=la
-    perhapsLT=LT
+  if test -z "$dry_run"; then
+    func_emit_lib_Makefile_am > $destdir/$sourcebase/Makefile.am
   else
-    libext=a
-    perhapsLT=
-  fi
-  (
-    if test -z "$dry_run"; then
-      exec > $destdir/$sourcebase/Makefile.am
-    else
-      echo "# $destdir/$sourcebase/Makefile.am"
-    fi
-    echo "## Process this file with automake to produce Makefile.in."
-    echo "# Copyright (C) 2004 Free Software Foundation, Inc."
-    echo "#"
-    echo "# This file is free software, distributed under the terms of the GNU"
-    echo "# General Public License.  As a special exception to the GNU General"
-    echo "# Public License, this file may be distributed as part of a program"
-    echo "# that contains a configuration script generated by Automake, under"
-    echo "# the same distribution terms as the rest of that program."
-    echo "#"
-    echo "# Generated by gnulib-tool."
-    echo "#"
-    echo "# Invoked as: $cmd"
-    echo "# Reproduce by: $actioncmd"
-    echo
-    echo "AUTOMAKE_OPTIONS = 1.8 gnits"
-    echo
-    echo "noinst_${perhapsLT}LIBRARIES = $libname.$libext"
-    echo
-    echo "${libname}_${libext}_SOURCES ="
-    echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@"
-    echo "EXTRA_DIST ="
-    echo "BUILT_SOURCES ="
-    echo "SUFFIXES ="
-    echo "MOSTLYCLEANFILES ="
-    echo "CLEANFILES ="
-    echo "DISTCLEANFILES ="
-    echo "MAINTAINERCLEANFILES ="
-    for module in $modules; do
-      func_verify_module
-      if test -n "$module"; then
-        func_get_automake_snippet "$module" | sed -e "s,lib_SOURCES,${libname}_${libext}_SOURCES,g" -e "s,lib_OBJECTS,${libname}_${libext}_OBJECTS,g"
-        if test "$module" = 'alloca'; then
-          echo "${libname}_${libext}_LIBADD += @ALLOCA@"
-        fi
-      fi
-    done
+    echo "# $destdir/$sourcebase/Makefile.am"
+    func_emit_lib_Makefile_am
     echo
     echo "# Makefile.am ends here"
-  )
+  fi
 
   # Create gnulib.m4.
   echo "Creating $destdir/$m4base/gnulib.m4..."
@@ -625,33 +641,7 @@ func_create_testdir ()
 
   # Create lib/Makefile.am.
   mkdir -p "$testdir/lib"
-  (echo "## Process this file with automake to produce Makefile.in."
-   echo
-   echo "AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies"
-   echo
-   echo "noinst_LIBRARIES = $libname.a"
-   echo
-   echo "$libname"'_a_SOURCES ='
-   echo "$libname"'_a_LIBADD = @LIBOBJS@'
-   echo '#'"$libname"'_la_LIBADD = @LTLIBOBJS@'
-   echo "EXTRA_DIST ="
-   echo "BUILT_SOURCES ="
-   echo "SUFFIXES ="
-   echo "MOSTLYCLEANFILES ="
-   echo "CLEANFILES ="
-   echo "DISTCLEANFILES ="
-   echo "MAINTAINERCLEANFILES ="
-   for module in $modules; do
-     func_verify_module
-     if test -n "$module"; then
-       func_get_automake_snippet "$module" | sed -e "s,lib_SOURCES,$libname"'_a_SOURCES,g' -e "s,lib_OBJECTS,$libname"'_a_OBJECTS,g'
-       if test "$module" = 'alloca'; then
-         echo "$libname"'_a_LIBADD += @ALLOCA@'
-         echo '#'"$libname"'_la_LIBADD += @LTALLOCA@'
-       fi
-     fi
-   done
-  ) > "$testdir/lib/Makefile.am"
+  func_emit_lib_Makefile_am > "$testdir/lib/Makefile.am"
 
   # Create m4/Makefile.am.
   mkdir -p "$testdir/m4"