diff options
author | Bruno Haible <bruno@clisp.org> | 2006-11-13 12:33:07 +0000 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2006-11-13 12:33:07 +0000 |
commit | 84a9f95106ff66514362705c09ad0156a73e4eba (patch) | |
tree | 7a0753935487e0a2360efa21b6323203863ff0fb /gnulib-tool | |
parent | 7f01591aadb13b59cb04f9ad42400eb7ea1c6e19 (diff) | |
download | gnulib-84a9f95106ff66514362705c09ad0156a73e4eba.tar.gz |
Synthesize also an EXTRA_lib_SOURCES augmentation.
Diffstat (limited to 'gnulib-tool')
-rwxr-xr-x | gnulib-tool | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/gnulib-tool b/gnulib-tool index 0f1eb49124..3c337e17ce 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2006-11-12 09:53:16 $' +cvsdatestamp='$Date: 2006-11-13 12:33:07 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` nl=' @@ -939,6 +939,23 @@ func_get_automake_snippet () echo "EXTRA_DIST +=" $extra_files echo fi + # Synthesize also an EXTRA_lib_SOURCES augmentation. + # This is necessary so that automake can generate the right list of + # dependency rules. + # A possible approach would be to use autom4te --trace of the redefined + # AC_LIBOBJ and AC_REPLACE_FUNCS macros when creating the Makefile.am + # (use autom4te --trace, not just grep, so that AC_LIBOBJ invocations + # inside autoconf's built-in macros are not missed). + # But it's simpler and more robust to do it here, based on the file list. + # If some .c file exists and is not used with AC_LIBOBJ - for example, + # a .c file is preprocessed into another .c file for BUILT_SOURCES -, + # automake will generate a useless dependency; this is harmless. + sed_extract_c_files='/\.c$/p' + extra_files=`echo "$extra_files" | sed -n -e "$sed_extract_c_files"` + if test -n "$extra_files"; then + echo "EXTRA_lib_SOURCES +=" $extra_files + echo + fi ;; esac } @@ -1186,6 +1203,7 @@ func_emit_lib_Makefile_am () # automake during its analyses looks for $(LIBOBJS), not for @LIBOBJS@. echo "${libname}_${libext}_LIBADD = \$(${macro_prefix}_${perhapsLT}LIBOBJS)" echo "${libname}_${libext}_DEPENDENCIES = \$(${macro_prefix}_${perhapsLT}LIBOBJS)" + echo "EXTRA_${libname}_${libext}_SOURCES =" if test "$libtool" = true; then echo "${libname}_${libext}_LDFLAGS = \$(AM_LDFLAGS)" fi |