progname=$0
package=gnulib
-cvsdatestamp='$Date: 2004-10-15 15:32:25 $'
+cvsdatestamp='$Date: 2004-10-17 17:50:25 $'
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
sed -n -e "/^Maintainer$sed_extract_prog" < "$gnulib_dir/modules/$1"
}
-# 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
-# - 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
-func_import ()
+# func_modules_transitive_closure
+# Input:
+# - modules list of specified modules
+# Output:
+# - modules list of modules, including dependencies
+func_modules_transitive_closure ()
{
- modules="$1"
- modules=`for m in $modules; do echo $m; done | sort | uniq`
-
- # Determine final module list.
while true; do
xmodules=
for module in $modules; do
fi
modules="$xmodules"
done
+}
+
+# func_modules_to_filelist
+# Input:
+# - modules list of modules, including dependencies
+# Output:
+# - files list of files
+func_modules_to_filelist ()
+{
+ files=
+ for module in $modules; do
+ func_verify_module
+ if test -n "$module"; then
+ files="$files "`func_get_filelist $module`
+ fi
+ done
+ 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 ="
+ echo
+ 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 += @${perhapsLT}ALLOCA@"
+ fi
+ } > amsnippet.tmp
+ # Skip the contents if its entirely empty.
+ if grep '[^ ]' amsnippet.tmp > /dev/null ; then
+ echo "## begin gnulib module $module"
+ echo
+ cat amsnippet.tmp
+ echo "## end gnulib module $module"
+ echo
+ fi
+ rm -f amsnippet.tmp
+ fi
+ done
+ echo
+ echo "# Makefile.am ends here"
+}
+
+# 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
+func_import ()
+{
+ modules="$1"
+ modules=`for m in $modules; do echo $m; done | sort | uniq`
+
+ # Determine final module list.
+ func_modules_transitive_closure
echo "Module list with included dependencies:"
echo "$modules" | sed -e 's/^/ /'
fi
# Determine final file list.
- files=
- for module in $modules; do
- func_verify_module
- if test -n "$module"; then
- files="$files "`func_get_filelist $module`
- fi
- done
- files=`for f in $files; do echo $f; done | sort | uniq`
+ func_modules_to_filelist
echo "File list:"
echo "$files" | sed -e 's/^/ /'
test -n "$dry_run" && dry=echo
$dry cp -p "$gnulib_dir/$f" "$destdir/$g"
# Update license.
- if test -z "$dry_run" -a -n "$lgpl" -a -n "$source"; then
+ if test -z "$dry_run" && test -n "$lgpl" && test -n "$source"; then
perl -pi -e 's/GNU General/GNU Lesser General/g;' \
-e 's/version 2([ ,])/version 2.1\1/g' \
$destdir/$g
if test -n "$libtool"; then
opt_libtool="--libtool"
fi
+ opt_lgpl=
if test -n "$lgpl"; then
opt_lgpl="--lgpl"
fi
# 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=
+ func_emit_lib_Makefile_am
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
- echo "# Makefile.am ends here"
- )
# Create gnulib.m4.
echo "Creating $destdir/$m4base/gnulib.m4..."
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
+ echo 'changequote(,)dnl'
+ echo 'LTALLOCA=`echo "$ALLOCA" | sed '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`'
+ echo 'changequote([, ])dnl'
+ echo 'AC_SUBST(LTALLOCA)'
+ fi
fi
done
echo "])"
modules=`for m in $modules; do echo $m; done | sort | uniq`
# Determine final module list.
- while true; do
- xmodules=
- for module in $modules; do
- func_verify_module
- if test -n "$module"; then
- # Duplicate dependenies are harmless, but Jim wants a warning.
- duplicated_deps=`func_get_dependencies $module | sort | uniq -d`
- if test -n "$duplicated_deps"; then
- echo "warning: module $module has duplicated dependencies: "`echo $duplicated_deps` 1>&2
- fi
- xmodules="$xmodules $module "`func_get_dependencies $module`
- fi
- done
- xmodules=`for m in $xmodules; do echo $m; done | sort | uniq`
- if test "$xmodules" = "$modules"; then
- break
- fi
- modules="$xmodules"
- done
+ func_modules_transitive_closure
echo "Module list with included dependencies:"
echo "$modules" | sed -e 's/^/ /'
# Determine final file list.
- files=
- for module in $modules; do
- func_verify_module
- if test -n "$module"; then
- files="$files "`func_get_filelist $module`
- fi
- done
- files=`for f in $files; do echo $f; done | sort | uniq`
+ func_modules_to_filelist
echo "File list:"
echo "$files" | sed -e 's/^/ /'
# 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"
projects / gnulib.git / blobdiff