X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=71b5908655ba6791c03747cc82675cca884981e1;hb=a01f44521eabbd8e33c93a979332e6d7cc2565b5;hp=a07442db9ef1b6587ee5719d645c163109c8be96;hpb=3ad5ea7588ed203a2143f0b89a6ac85ac85f2fd6;p=gnulib.git

diff --git a/gnulib-tool b/gnulib-tool
index a07442db9..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 22:57:10 $'
+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}_${libext}_SOURCES,g" -e "s,lib_OBJECTS,${libname}_${libext}_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.
@@ -617,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."