X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=71b5908655ba6791c03747cc82675cca884981e1;hb=585b66115ae4ec5d843efc5508c90be6dde71a01;hp=d43afed5bcff131855be7d3b7660071e2b67c924;hpb=32712a7f713b2a366f8f0eb637c99e2fc1f023ea;p=gnulib.git

diff --git a/gnulib-tool b/gnulib-tool
index d43afed5b..71b590865 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2004-10-15 20:20:11 $'
+cvsdatestamp='$Date: 2005-01-05 02:50:04 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -455,9 +455,10 @@ func_emit_lib_Makefile_am ()
     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'
+        func_get_automake_snippet "$module" |
+          sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g'
         if test "$module" = 'alloca'; then
-          echo "${libname}_${libext}_LIBADD += @{perhapsLT}ALLOCA@"
+          echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"
         fi
       } > amsnippet.tmp
       # Skip the contents if its entirely empty.
@@ -471,6 +472,8 @@ func_emit_lib_Makefile_am ()
       rm -f amsnippet.tmp
     fi
   done
+  echo
+  echo "# Makefile.am ends here"
 }
 
 # func_import modules
@@ -547,10 +550,7 @@ func_import ()
   if test -z "$dry_run"; then
     func_emit_lib_Makefile_am > $destdir/$sourcebase/Makefile.am
   else
-    echo "# $destdir/$sourcebase/Makefile.am"
     func_emit_lib_Makefile_am
-    echo
-    echo "# Makefile.am ends here"
   fi
 
   # Create gnulib.m4.
@@ -589,7 +589,7 @@ func_import ()
       func_verify_module
       if test -n "$module"; then
         func_get_autoconf_snippet "$module" | sed -e '/^$/d;' -e 's/^/  /' -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./'
-        if test "$module" = 'alloca' && test -n "$libtool; then
+        if test "$module" = 'alloca' && test -n "$libtool"; then
           echo 'changequote(,)dnl'
           echo 'LTALLOCA=`echo "$ALLOCA" | sed '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`'
           echo 'changequote([, ])dnl'
@@ -618,6 +618,11 @@ func_import ()
   )
   echo "Finished."
   echo
+  echo "You may need to add #include directives for the following .h files."
+  for module in $modules; do
+    func_get_include_directive "$module" | sed -e '/^$/d;' -e 's/^/  /'
+  done
+  echo
   echo "Don't forget to add \"$sourcebase/Makefile\""
   echo "to AC_CONFIG_FILES in \"$configure_ac\" and to mention"
   echo "\"`basename $sourcebase`\" in SUBDIRS in some Makefile.am."