X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=0046ff5160188d582845d2e5f4afefc8eb6730b6;hb=eb84fa936d140769a5aa9641a7923fad8bea753b;hp=7fe55f08e567fed9bcf8ab98a2893ded961cc62e;hpb=0a2f71be9fe8da7b21600957e5e56346d3b027a6;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index 7fe55f08e..0046ff516 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2007-01-17 23:46:34 $' +cvsdatestamp='$Date: 2007-02-01 01:52:34 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` nl=' @@ -71,7 +71,7 @@ fi # However, do this only for gnulib-tool itself, not for the code that # gnulib-tool generates, since we don't want "sed --posix" to leak # into makefiles. -if (alias) > /dev/null 2>&1 && echo | sed --posix d >/dev/null 2>&1; then +if (alias) > /dev/null 2>&1 && echo | sed --posix -e d >/dev/null 2>&1; then alias sed='sed --posix' fi @@ -93,6 +93,7 @@ Usage: gnulib-tool --list gnulib-tool --extract-autoconf-snippet module gnulib-tool --extract-automake-snippet module gnulib-tool --extract-include-directive module + gnulib-tool --extract-link-directive module gnulib-tool --extract-license module gnulib-tool --extract-maintainer module gnulib-tool --extract-tests-module module @@ -117,6 +118,7 @@ Operation modes: --extract-autoconf-snippet extract the snippet for configure.ac --extract-automake-snippet extract the snippet for library makefile --extract-include-directive extract the #include directive + --extract-link-directive extract the linker directive --extract-license report the license terms of the source files under lib/ --extract-maintainer report the maintainer(s) inside gnulib @@ -891,6 +893,7 @@ sed_extract_prog=':[ ]*$/ { s/^configure\.ac:[ ]*$// s/^Makefile\.am:[ ]*$// s/^Include:[ ]*$// + s/^Link:[ ]*$// s/^License:[ ]*$// s/^Maintainer:[ ]*$// tb @@ -1015,6 +1018,15 @@ func_get_include_directive () sed -e 's/^\(["<]\)/#include \1/' } +# func_get_link_directive module +# Input: +# - local_gnulib_dir from --local-dir +func_get_link_directive () +{ + func_lookup_file "modules/$1" + sed -n -e "/^Link$sed_extract_prog" < "$lookedup_file" +} + # func_get_license module # Input: # - local_gnulib_dir from --local-dir @@ -1180,6 +1192,7 @@ func_modules_to_filelist () # - libtool true if libtool will be used, false or blank otherwise # - macro_prefix prefix of gl_LIBOBJS macros to use # - actioncmd (optional) command that will reproduce this invocation +# - for_test true if creating a package for testing, false otherwise # Output: # - uses_subdirs nonempty if object files in subdirs exist func_emit_lib_Makefile_am () @@ -1200,6 +1213,15 @@ func_emit_lib_Makefile_am () perhapsLT= sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d' fi + if $for_test; then + # When creating a package for testing: Attempt to provoke failures, + # especially link errors, already during "make" rather than during + # "make check", because "make check" is not possible in a cross-compiling + # situation. Turn check_PROGRAMS into noinst_PROGRAMS. + sed_transform_check_PROGRAMS='s,check_PROGRAMS,noinst_PROGRAMS,g' + else + sed_transform_check_PROGRAMS= + fi echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" echo "## Process this file with automake to produce Makefile.in." func_emit_copyright_notice @@ -1219,7 +1241,8 @@ func_emit_lib_Makefile_am () sed -e "$sed_eliminate_LDFLAGS" | sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' | sed -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ - -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' + -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' | + sed -e "$sed_transform_check_PROGRAMS" if test "$module" = 'alloca'; then echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@" echo "${libname}_${libext}_DEPENDENCIES += @${perhapsLT}ALLOCA@" @@ -1276,7 +1299,7 @@ func_emit_lib_Makefile_am () echo "AM_CPPFLAGS =" fi echo - if grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *= *$libname\\.$libext\$" allsnippets.tmp > /dev/null; then + if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *= *$libname\\.$libext\$" allsnippets.tmp > /dev/null; then # One of the snippets already specifies an installation location for the # library. Don't confuse automake by saying it should not be installed. : @@ -1318,6 +1341,7 @@ func_emit_lib_Makefile_am () # - sourcebase relative directory containing lib source code # - m4base relative directory containing autoconf macros # - testsbase relative directory containing unit test code +# - for_test true if creating a package for testing, false otherwise func_emit_tests_Makefile_am () { if test "$libtool" = true; then @@ -1332,6 +1356,15 @@ func_emit_tests_Makefile_am () libext=a sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d' fi + if $for_test; then + # When creating a package for testing: Attempt to provoke failures, + # especially link errors, already during "make" rather than during + # "make check", because "make check" is not possible in a cross-compiling + # situation. Turn check_PROGRAMS into noinst_PROGRAMS. + sed_transform_check_PROGRAMS='s,check_PROGRAMS,noinst_PROGRAMS,g' + else + sed_transform_check_PROGRAMS= + fi testsbase_inverse=`echo "$testsbase" | sed -e 's,/$,,' | sed -e 's,[^/][^/]*,..,g'` echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" echo "## Process this file with automake to produce Makefile.in." @@ -1353,7 +1386,8 @@ func_emit_tests_Makefile_am () sed -e "$sed_eliminate_LDFLAGS" | sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' | sed -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ - -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' + -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' | + sed -e "$sed_transform_check_PROGRAMS" } > amsnippet.tmp # Skip the contents if its entirely empty. if grep '[^ ]' amsnippet.tmp > /dev/null ; then @@ -1374,7 +1408,9 @@ func_emit_tests_Makefile_am () echo "TESTS =" echo "TESTS_ENVIRONMENT =" echo "noinst_PROGRAMS =" - echo "check_PROGRAMS =" + if ! $for_test; then + echo "check_PROGRAMS =" + fi echo "noinst_HEADERS =" if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then echo "pkgdata_DATA =" @@ -1942,6 +1978,9 @@ func_import () makefile_am=Makefile.am fi + # Create normal Makefile.ams. + for_test=false + # Create library makefile. func_dest_tmpfilename $sourcebase/$makefile_am func_emit_lib_Makefile_am > "$tmpfile" @@ -2120,7 +2159,7 @@ func_import () # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is # created using libtool, because libtool already handles the dependencies. if test "$libtool" != true; then - libname_upper=`echo "$libname" | tr 'a-z' 'A-Z'` + libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'` echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" echo " AC_SUBST([${libname_upper}_LIBDEPS])" echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" @@ -2225,6 +2264,19 @@ func_import () ) | sed -e '/^$/d' -e 's/^/ /' rm -f "$tmp"/include-angles "$tmp"/include-quotes "$tmp"/include-if + for module in $modules; do + func_get_link_directive "$module" + done \ + | LC_ALL=C sort -u | sed -e '/^$/d' -e 's/^/ /' > "$tmp"/link + if test `wc -l < "$tmp"/link` != 0; then + echo + echo "You may need to use the following Makefile variables when linking." + echo "Use them in _LDADD when linking a program, or" + echo "in _a_LDFLAGS or _la_LDFLAGS when linking a library." + cat "$tmp"/link + fi + rm -f "$tmp"/link + echo echo "Don't forget to" if test "$makefile_am" = Makefile.am; then @@ -2373,6 +2425,9 @@ func_create_testdir () exec 0<&5 5<&- } + # Create Makefile.ams that are for testing. + for_test=true + # Create $sourcebase/Makefile.am. mkdir -p "$testdir/$sourcebase" func_emit_lib_Makefile_am > "$testdir/$sourcebase/Makefile.am" @@ -2478,7 +2533,7 @@ func_create_testdir () # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is # created using libtool, because libtool already handles the dependencies. if test "$libtool" != true; then - libname_upper=`echo "$libname" | tr 'a-z' 'A-Z'` + libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'` echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" echo " AC_SUBST([${libname_upper}_LIBDEPS])" echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" @@ -2591,7 +2646,7 @@ func_create_testdir () # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is # created using libtool, because libtool already handles the dependencies. if test "$libtool" != true; then - libname_upper=`echo "$libname" | tr 'a-z' 'A-Z'` + libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'` echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" echo " AC_SUBST([${libname_upper}_LIBDEPS])" echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" @@ -2829,7 +2884,7 @@ case $mode in m4dirs= m4dirs_count=0 if test -f "$destdir"/Makefile.am; then - aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ ]*=' "$destdir"/Makefile.am | sed -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/'` + aclocal_amflags=`sed -n 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/p' "$destdir"/Makefile.am` m4dir_is_next= for arg in $aclocal_amflags; do if test -n "$m4dir_is_next"; then @@ -2843,6 +2898,7 @@ case $mode in fi ;; esac + m4dir_is_next= else if test "X$arg" = "X-I"; then m4dir_is_next=yes @@ -3025,6 +3081,16 @@ case $mode in done ;; + extract-link-directive ) + for module + do + func_verify_module + if test -n "$module"; then + func_get_link_directive "$module" + fi + done + ;; + extract-license ) for module do