[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Libtool branch, master, updated. v2.4.2-62-gb544ca3
|
From: |
Gary V. Vaughan |
|
Subject: |
[SCM] GNU Libtool branch, master, updated. v2.4.2-62-gb544ca3 |
|
Date: |
Tue, 08 Nov 2011 14:35:29 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".
The branch, master has been updated
via b544ca378409b3807e6386eb6277c61a11079185 (commit)
via 99a808be8ce850b8a78e0b2c9f63ac0c1d9d544e (commit)
via bcbf77525dc93c3072245bd9db568391eea52caf (commit)
via 09ae9801874de3fca75d67db0dcb5939c7208515 (commit)
from c6bbcb35f5e55890dbb0151e397b5cc18114b330 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b544ca378409b3807e6386eb6277c61a11079185
Author: Gary V. Vaughan <address@hidden>
Date: Fri Oct 28 20:45:56 2011 +0700
libtoolize: massage installed auxiliary script list at make time.
* Makefile.am (configure_edit): Rename pkgconfig_files
substitution to pkgaux_files, and add pkgaux_install_files and
pkgaux_parent_files substitutions for atlocal.
(pkgauxdir): Where to install pkgaux_files.
(auxfiles): Removed, and replaced by...
(pkgaux_parent_files, pkgaux_install_files, pkgaux_data_files):
...these, which separate the files lists more logically for
easier installation, and use by libtoolize.m4sh.
(uninstall-hook): Adjust.
(tests/atlocal): Adjust.
* bootstrap.conf (libtool_link_libltdl_subdirs): Adjust.
* libtoolize.m4sh (func_install_pkgconfig_files)
(func_install_pkgconfig_subproject)
(func_install_pkgconfig_parent, func_install_pkgconfig_files)
(all_pkgconfig_files): Renamed to...
(func_install_pkgaux_files, unc_install_pkgaux_subproject)
(func_install_pkgaux_parent, func_install_pkgaux_files)
(all_pkgaux_files): ...these, resp. Adjust all callers.
(func_massage_pkgconfig_files): Removed.
(pkgaux_files): List of all auxiliary scripts substituted from
Makefile.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 99a808be8ce850b8a78e0b2c9f63ac0c1d9d544e
Author: Gary V. Vaughan <address@hidden>
Date: Fri Oct 28 23:25:48 2011 +0700
libtoolize: massage installed libltdl file list at make time.
* libtoolize.m4sh (pkgltdldir, pkgdatadir): Put installable
libltdl files in pkgdatadir. When testing, and _lt_pkgdatadir
is set, adjust to look in libltdl subdirectory.
(func_massage_pkgltdl_files): Removed function and only caller,
because...
(pkgltdl_files): ...we substitute the pre-massaged files
directly...
(func_install_pkgltdl_files): ...from here.
Adjust installation of specially handled additional files.
* Makefile.am (ltdldir): Location of libltdl files in source
tree.
(ltdldest, ltdldatafiles): Removed.
(pkgltdl_files): New pre-massaged list of libltdl sources.
(install-data-local, uninstall-hook): Use it.
* tests/libtoolize.at: Reorder expected output to match actual
libtoolize output.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit bcbf77525dc93c3072245bd9db568391eea52caf
Author: Gary V. Vaughan <address@hidden>
Date: Fri Oct 28 16:46:52 2011 +0700
libtoolize: massage installed macro list at make time.
* libtoolize.m4sh (func_massage_aclocal_DATA): Removed function
and only caller, because...
(pkgmacro_files): ...we substitute the pre-massaged files
directly...
(func_install_pkgmacro_files): ...from here.
* Makefile.am (pkgmacro_files): New pre-massaged list of aclocal
macros used by func_install_pkgmacro_files.
(configure_edit): Substitute pkgmacro_files instead of
aclocalfiles.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 09ae9801874de3fca75d67db0dcb5939c7208515
Author: Gary V. Vaughan <address@hidden>
Date: Fri Oct 28 19:18:43 2011 +0700
libtoolize: use only space delimited file lists.
We don't install any files with whitespace in their file name,
so using colon delimited lists to make that possible was a
premature optimisation and an unneeded complication.
* libtoolize.m4sh (func_copy_some_files): Remove IFS twiddling,
and just pull space delimited files in a for loop idiomatically.
(func_massage_aclocal_DATA, func_install_pkgmacro_subproject)
(func_install_pkgmacro_parent, func_install_pkgmacro_files)
(func_massage_pkgltdl_files, func_massage_pkgconfig_files):
Append to file lists with space delimiter.
Signed-off-by: Gary V. Vaughan <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 103 ++++++++++++-------
configure.ac | 3 +-
libtoolize.m4sh | 285 +++++++++++++++++----------------------------------
tests/libtoolize.at | 144 +++++++++++++-------------
4 files changed, 230 insertions(+), 305 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5e57bfe..a74d854 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -273,7 +273,6 @@ all-local: $(LTDL_BOOTSTRAP_DEPS)
## ---------------- ##
configure_edit = $(SED) \
- -e 's,@aclocal_DATA\@,$(aclocalfiles),g' \
-e 's,@aclocaldir\@,$(aclocaldir),g' \
-e 's,@aux_dir\@,$(aux_dir),g' \
-e 's,@datadir\@,$(datadir),g' \
@@ -283,9 +282,12 @@ configure_edit = $(SED) \
-e 's,@host_triplet\@,$(host_triplet),g' \
-e 's,@LN_S\@,$(LN_S),g' \
-e 's,@macro_dir\@,$(macro_dir),g' \
- -e "s,@pkgconfig_files\@,$(auxfiles),g" \
+ -e 's,@pkgaux_files\@,$(pkgaux_scripts) $(pkgaux_data_files),g' \
+ -e 's,@pkgaux_install_files\@,$(pkgaux_install_files),g' \
+ -e 's,@pkgaux_parent_files\@,$(pkgaux_parent_files),g' \
-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
- -e "s,@pkgltdl_files\@,$(ltdldatafiles),g" \
+ -e 's,@pkgltdl_files\@,$(pkgltdl_files),g' \
+ -e 's,@pkgmacro_files\@,$(pkgmacro_files),g' \
-e 's,@prefix\@,$(prefix),g' \
-e 's,@SED\@,$(SED),g' \
-e 's,@srcdir\@,$(srcdir),g'
@@ -437,49 +439,68 @@ $(libtoolize_1): $(libtoolize_in)
## Installation. ##
## ------------- ##
+ltdldir = $(srcdir)/libltdl
+pkgauxdir = $(pkgdatadir)/build-aux
+
# The timestamps on these files must be preserved carefully so we install,
# uninstall and set executable with custom rules here.
-auxfiles = $(pkgaux_scripts) config/ltmain.sh
+pkgaux_parent_files = ltmain.sh
+pkgaux_install_files = config.guess config.sub install-sh
+pkgaux_data_files = $(pkgaux_parent_files)
# Everything that gets picked up by aclocal is automatically distributed,
# this is the list of macro files we install on the user's system.
-aclocalfiles = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 m4/ltoptions.m4 \
- m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4
+pkgmacro_files = argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 \
+ ltversion.m4 lt~obsolete.m4
## These are installed as a subdirectory of pkgdatadir so that
## libtoolize --ltdl can find them later:
-ltdldatafiles = libltdl/COPYING.LIB \
- libltdl/README \
- libltdl/Makefile.inc \
- libltdl/Makefile.am \
- libltdl/configure.ac \
- libltdl/aclocal.m4 \
- libltdl/Makefile.in \
- libltdl/config-h.in \
- libltdl/configure \
- libltdl/argz_.h \
- libltdl/argz.c \
- libltdl/loaders/dld_link.c \
- libltdl/loaders/dlopen.c \
- libltdl/loaders/dyld.c \
- libltdl/loaders/load_add_on.c \
- libltdl/loaders/loadlibrary.c \
- libltdl/loaders/shl_load.c \
- libltdl/lt__dirent.c \
- libltdl/lt__strl.c \
- $(libltdl_libltdl_la_SOURCES)
+pkgltdl_files = COPYING.LIB \
+ Makefile.am \
+ Makefile.in \
+ Makefile.inc \
+ README \
+ aclocal.m4 \
+ argz_.h \
+ argz.c \
+ config-h.in \
+ configure \
+ configure.ac \
+ libltdl/lt__alloc.h \
+ libltdl/lt__dirent.h \
+ libltdl/lt__glibc.h \
+ libltdl/lt__private.h \
+ libltdl/lt__strl.h \
+ libltdl/lt_dlloader.h \
+ libltdl/lt_error.h \
+ libltdl/lt_system.h \
+ libltdl/slist.h \
+ loaders/dld_link.c \
+ loaders/dlopen.c \
+ loaders/dyld.c \
+ loaders/load_add_on.c \
+ loaders/loadlibrary.c \
+ loaders/preopen.c \
+ loaders/shl_load.c \
+ lt__alloc.c \
+ lt__dirent.c \
+ lt__strl.c \
+ lt_dlloader.c \
+ lt_error.c \
+ ltdl.c \
+ ltdl.h \
+ slist.c
install-data-local: $(lt_Makefile_in)
@$(NORMAL_INSTALL)
## Don't install over the top of an old pkgdatadir
-rm -rf '$(DESTDIR)$(pkgdatadir)'/*
## First, put a copy of the libtool m4 macros in the aclocal dir
- @list='$(aclocalfiles)'; for p in $$list; do \
- f=`echo "$$p" |'$(SED)' 's|^.*/||'`; \
- d=`echo "$(DESTDIR)$(aclocaldir)/$$f" |$(SED) 's,[^/]*$$,,'`; \
+ @list='$(pkgmacro_files)'; for p in $$list; do \
+ d=`echo "$(DESTDIR)$(aclocaldir)/$$p" |$(SED) 's,[^/]*$$,,'`; \
test -d "$$d" || $(mkinstalldirs) "$$d"; \
- echo " $(INSTALL_DATA) '$(srcdir)/$(macro_dir)/$$f'
'$(DESTDIR)$(aclocaldir)/$$f'"; \
- $(INSTALL_DATA) "$(srcdir)/$(macro_dir)/$$f"
"$(DESTDIR)$(aclocaldir)/$$f"; \
+ echo " $(INSTALL_DATA) '$(srcdir)/$(macro_dir)/$$p'
'$(DESTDIR)$(aclocaldir)/$$p'"; \
+ $(INSTALL_DATA) "$(srcdir)/$(macro_dir)/$$p"
"$(DESTDIR)$(aclocaldir)/$$p"; \
done
## install the helper scripts
@list='config/extract-trace config/options-parser $(pkgaux_scripts)' &&
\
@@ -489,15 +510,20 @@ install-data-local: $(lt_Makefile_in)
echo " $(INSTALL_SCRIPT) '$(srcdir)/$(ltdl_dir)/$$p'
'$(DESTDIR)$(pkgdatadir)/$$p'"; \
$(INSTALL_SCRIPT) "$(srcdir)/$(ltdl_dir)/$$p"
"$(DESTDIR)$(pkgdatadir)/$$p"; \
done
- $(INSTALL_DATA) "$(ltmain_sh)"
"$(DESTDIR)$(pkgdatadir)/config/ltmain.sh"
+ @list='$(auxfiles)' && for p in $$list; do \
+ d=`echo "$(DESTDIR)$(pkgdatadir)/$$p" |$(SED) 's,[^/]*$$,,'`; \
+ test -d "$$d" || $(mkinstalldirs) "$$d"; \
+ echo " $(INSTALL_DATA) '$(srcdir)/$(ltdl_dir)/$$p'
'$(DESTDIR)$(pkgdatadir)/$$p'"; \
+ $(INSTALL_DATA) "$(srcdir)/$(ltdl_dir)/$$p"
"$(DESTDIR)$(pkgdatadir)/$$p"; \
+ done
## install the libltdl files
- @list='$(ltdldatafiles)' && for p in $$list; do \
+ @list='$(pkgltdl_files)' && for p in $$list; do \
d=`echo "$(DESTDIR)$(pkgdatadir)/$$p" |$(SED) 's,[^/]*$$,,'`; \
test -d "$$d" || $(mkinstalldirs) "$$d"; \
- echo " $(INSTALL_DATA) '$(srcdir)/$$p'
'$(DESTDIR)$(pkgdatadir)/$$p'"; \
- $(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
+ echo " $(INSTALL_DATA) '$(ltdldir)/$$p'
'$(DESTDIR)$(pkgdatadir)/$$p'"; \
+ $(INSTALL_DATA) "$(ltdldir)/$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
done
- -chmod a+x '$(DESTDIR)$(pkgdatadir)/libltdl/configure'
+ -chmod a+x '$(DESTDIR)$(pkgdatadir)/configure'
## ------------- ##
@@ -557,11 +583,12 @@ dist-hook: $(changelog) $(dotversion) $(readme)
uninstall-hook:
@$(NORMAL_UNINSTALL)
- @list='$(ltdldatafiles) $(auxfiles)'; for f in $$list; do \
+ @list='$(pkgltdl_files) $(pkgaux_scripts) $(pkgaux_data_files)'; \
+ for f in $$list; do \
echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
done
- @for p in $(aclocalfiles); do \
+ @for p in $(pkgmacro_files); do \
f=`echo "$$p" |$(SED) 's|^.*/||'`; \
echo " rm -f '$(DESTDIR)$(aclocaldir)/$$f'"; \
rm -f "$(DESTDIR)$(aclocaldir)/$$f"; \
diff --git a/configure.ac b/configure.ac
index 097361b..d6906d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,8 +121,7 @@ fi
# The list of scripts required to build libltdl, and which need to be
# installed by libtoolize --ltdl, and consequently need to be placed in
# $pkgdatadir by our make install rule.
-pkgaux_scripts="config/compile config/config.guess config/config.sub \
- config/depcomp config/install-sh config/missing"
+pkgaux_scripts="compile config.guess config.sub depcomp install-sh missing"
AC_SUBST([pkgaux_scripts])
# All subdirectories that are configured on demand, but that must be
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 10e8a25..9299a8c 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -270,24 +270,20 @@ func_copy_cb ()
}
-# func_copy_some_files srcfile_spec srcdir destdir [msg_var] [cb=func_copy_cb]
-# Call COPY_CB for each regular file in SRCDIR named by the ':' delimited
-# names in SRCFILE_SPEC. The odd calling convention is needed to allow
-# spaces in file and directory names.
+# func_copy_some_files srcfile_list srcdir destdir [msg_var] [cb=func_copy_cb]
+# Call COPY_CB for each regular file in SRCDIR named by the space delimited
+# names in SRCFILE_LIST.
func_copy_some_files ()
{
$debug_cmd
- my_srcfile_spec="$1"
+ my_srcfile_list="$1"
my_srcdir="$2"
my_destdir="$3"
my_msg_var="$4"
my_copy_cb="${5-func_copy_cb}"
- my_save_IFS="$IFS"
- IFS=:
- for my_filename in $my_srcfile_spec; do
- IFS="$my_save_IFS"
+ for my_filename in $my_srcfile_list; do
if test -f "$my_srcdir/$my_filename"; then
if test "X$my_copy_cb" = Xfunc_copy_cb; then
$opt_force || if test -f "$my_destdir/$my_filename"; then
@@ -304,7 +300,6 @@ func_copy_some_files ()
$my_copy_cb "$my_filename" "$my_srcdir" "$my_destdir" "$my_msg_var"
done
- IFS="$my_save_IFS"
}
@@ -764,37 +759,6 @@ func_install_update ()
}
-# func_massage_aclocal_DATA [glob_exclude]
-# @aclocal_DATA\@ is substituted as per its value in Makefile.am;
-# this function massages it into a suitable format for func_copy_some_files.
-func_massage_aclocal_DATA ()
-{
- $debug_cmd
-
- pkgmacro_files= # GLOBAL VAR
-
- my_glob_exclude="$1"
-
- # Massage a value for pkgmacro_files from the value used in Makefile.am.
- for my_filename in @aclocal_DATA@; do
- func_dirname_and_basename "$my_filename"
- my_filename=$func_basename_result
-
- # ignore excluded filenames
- if test -n "$my_glob_exclude"; then
- my_cont=false
- eval 'case $my_filename in '$my_glob_exclude') my_cont=: ;; esac'
- $my_cont && continue
- fi
-
- pkgmacro_files="$pkgmacro_files:$my_filename"
- done
-
- # strip spurious leading `:'
- pkgmacro_files=`$ECHO "$pkgmacro_files" | $SED 's,^:*,,'`
-}
-
-
# func_install_pkgmacro_subproject
# Unless --quiet was passed, display a message. Then copy pkgmacro_files
# from libtool installation tree to subproject libltdl tree.
@@ -819,7 +783,7 @@ func_install_pkgmacro_subproject ()
pkgmacro_header="putting macros in AC_CONFIG_MACRO_DIR,
\`$subproject_macro_dir'."
fi
- func_copy_some_files "argz.m4:libtool.m4:ltdl.m4:$pkgmacro_files" \
+ func_copy_some_files "$pkgmacro_files" \
"$aclocaldir" "$subproject_macro_dir" pkgmacro_header
}
@@ -850,31 +814,30 @@ func_install_pkgmacro_parent ()
my_pkgmacro_header="putting macros in \`$macro_dir'."
fi
- if $opt_ltdl; then
- func_serial_update argz.m4 "$aclocaldir" "$macro_dir" \
- my_pkgmacro_header argz.m4
- else
- func_verbose "Not copying \`$macro_dir/argz.m4', libltdl not used."
- fi
+ for file in $pkgmacro_files; do
+ case $file in
+ argz.m4|ltdl.m4)
+ $opt_ltdl || {
+ func_verbose "Not copying \`$macro_dir/$file', libltdl not used."
+ continue
+ }
+ ;;
+ esac
- func_serial_update libtool.m4 "$aclocaldir" "$macro_dir" \
- my_pkgmacro_header LT_INIT 'A[CM]_PROG_LIBTOOL'
+ case $file in
+ libtool.m4)
+ func_serial_update libtool.m4 "$aclocaldir" "$macro_dir" \
+ my_pkgmacro_header LT_INIT 'A[CM]_PROG_LIBTOOL' ;;
- if $opt_ltdl; then
- func_serial_update ltdl.m4 "$aclocaldir" "$macro_dir" \
- my_pkgmacro_header 'LTDL_INIT'
- else
- func_verbose "Not copying \`$macro_dir/ltdl.m4', libltdl not used."
- fi
+ ltdl.m4)
+ func_serial_update ltdl.m4 "$aclocaldir" "$macro_dir" \
+ my_pkgmacro_header 'LTDL_INIT' ;;
- my_save_IFS="$IFS"
- IFS=:
- for file in $pkgmacro_files; do
- IFS="$my_save_IFS"
- func_serial_update "$file" "$aclocaldir" "$macro_dir" \
- my_pkgmacro_header "$file"
+ *)
+ func_serial_update "$file" "$aclocaldir" "$macro_dir" \
+ my_pkgmacro_header "$file" ;;
+ esac
done
- IFS="$my_save_IFS"
}
@@ -890,9 +853,6 @@ func_install_pkgmacro_files ()
$require_ltdl_mode
$require_macro_dir
- # argz.m4, libtool.m4 and ltdl.m4 are handled specially:
- func_massage_aclocal_DATA 'argz.m4|libtool.m4|ltdl.m4'
-
# 1. Parent has separate macro_dir to subproject ltdl:
if $opt_ltdl && test "x$ltdl_mode" = "xsubproject" &&
test "x$macro_dir" != "x$subproject_macro_dir"
@@ -919,46 +879,10 @@ func_install_pkgmacro_files ()
}
-# func_massage_pkgltdl_files [glob_exclude]
-# @pkgltdl_files\@ is substituted as per its value in Makefile.am; this
-# function massages it into a suitable format for func_copy_some_files.
-func_massage_pkgltdl_files ()
-{
- $debug_cmd
-
- pkgltdl_files= # GLOBAL VAR
-
- my_glob_exclude="$1"
-
- # Massage a value for pkgltdl_files from the value used in Makefile.am
- for my_filename in @pkgltdl_files@; do
-
- # Strip surplus leading 'libltdl/':
- my_filename=`expr "X$my_filename" : 'Xlibltdl/\(.*\)'`
-
- # ignore excluded filenames
- if test -n "$my_glob_exclude"; then
- my_cont=false
- eval 'case $my_filename in '$my_glob_exclude') my_cont=: ;; esac'
- $my_cont && continue
- fi
-
- # ignore duplicates
- case :$pkgltdl_files: in
- *:$my_filename:*) ;;
- *) pkgltdl_files="$pkgltdl_files:$my_filename" ;;
- esac
- done
-
- # strip spurious leading `:'
- pkgltdl_files=`$ECHO "$pkgltdl_files" | $SED 's,^:*,,'`
-}
-
-
# func_install_pkgltdl_files
# Install copies of the libltdl files into this package. Any auxiliary
# or m4 macro files needed in the libltdl tree will also be copied by
-# func_install_pkgconfig_files and func_install_pkgmacro_files resp.
+# func_install_pkgaux_files and func_install_pkgmacro_files resp.
func_install_pkgltdl_files ()
{
$debug_cmd
@@ -984,65 +908,35 @@ func_install_pkgltdl_files ()
pkgltdl_header="putting libltdl files in \`$ltdl_dir'."
fi
- # These files are handled specially, depending on ltdl_mode:
- if test "x$ltdl_mode" = "xsubproject"; then
- func_massage_pkgltdl_files 'Makefile.inc'
- else
- func_massage_pkgltdl_files 'Makefile.am|Makefile.in*|aclocal.m4|config*'
- fi
-
- func_copy_some_files "$pkgltdl_files" \
- "$pkgltdldir/libltdl" "$ltdl_dir" pkgltdl_header
-
- # For recursive ltdl modes, copy a suitable Makefile.{am,inc}:
- case $ltdl_mode in
- recursive)
- func_fixup_Makefile "Makefile.am" "$pkgltdldir/libltdl" "$ltdl_dir"
- ;;
- nonrecursive)
- func_fixup_Makefile "Makefile.inc" "$pkgltdldir/libltdl" "$ltdl_dir"
- ;;
- esac
-}
-
-
-# func_massage_pkgconfig_files [glob_exclude]
-# @pkgconfig_files\@ is substituted as per its value in Makefile.am; this
-# function massages it into a suitable format for func_copy_some_files.
-func_massage_pkgconfig_files ()
-{
- $debug_cmd
-
- pkgconfig_files= # GLOBAL VAR
-
- my_glob_exclude="$1"
-
- # Massage a value for pkgconfig_files from the value used in Makefile.am
- for my_filename in @pkgconfig_files@; do
-
- # ignore excluded filenames
- if test -n "$my_glob_exclude"; then
- my_cont=false
- eval 'case $my_filename in '$my_glob_exclude') my_cont=: ;; esac'
- $my_cont && continue
- fi
-
- # ignore duplicates
- case :$pkgconfig_files: in
- *:$my_filename:*) ;;
- *) pkgconfig_files="$pkgconfig_files:$my_filename" ;;
+ # Copy ltdl sources appropriate to the requested ltdl_mode.
+ for file in $pkgltdl_files; do
+ case $file in
+ Makefile.am|Makefile.in)
+ test recursive = "$ltdl_mode" \
+ && func_fixup_Makefile "$file" "$pkgltdldir" "$ltdl_dir"
+ test subproject = "$ltdl_mode" \
+ && func_copy "$pkgltdldir/$file" "$ltdl_dir/$file" pkgltdl_header
+ ;;
+ Makefile.inc)
+ test nonrecursive = "$ltdl_mode" \
+ && func_fixup_Makefile "$file" "$pkgltdldir" "$ltdl_dir"
+ ;;
+ aclocal.m4|config-h.in|configure|configure.ac)
+ test subproject = "$ltdl_mode" \
+ && func_copy "$pkgltdldir/$file" "$ltdl_dir/$file" pkgltdl_header
+ ;;
+ *)
+ func_copy "$pkgltdldir/$file" "$ltdl_dir/$file" pkgltdl_header
+ ;;
esac
done
-
- # strip spurious leading `:'
- pkgconfig_files=`$ECHO "$pkgconfig_files" | $SED 's,^:*,,'`
}
-# func_install_pkgconfig_subproject
-# Unless --quiet was passed, display a message. Then copy pkgconfig_files
+# func_install_pkgaux_subproject
+# Unless --quiet was passed, display a message. Then copy pkgaux_files
# from libtool installation tree to subproject libltdl tree.
-func_install_pkgconfig_subproject ()
+func_install_pkgaux_subproject ()
{
$debug_cmd
@@ -1052,7 +946,7 @@ func_install_pkgconfig_subproject ()
# Remove any lingering files that my have been installed by some
# previous libtoolize release:
- $opt_force && for file in $all_pkgconfig_files; do
+ $opt_force && for file in $all_pkgaux_files; do
test -f "$subproject_aux_dir/$file" && func_verbose "rm -f
'$subproject_aux_dir/$file'"
rm -f "$subproject_aux_dir/$file"
done
@@ -1060,23 +954,23 @@ func_install_pkgconfig_subproject ()
# Copy all the files from installed libltdl to this project, if the
# user specified an aux_dir.
$opt_quiet || if test "x$ac_aux_dir" = "x$subproject_aux_dir"; then
- pkgconfig_header="putting auxiliary files in AC_CONFIG_AUX_DIR,
\`$subproject_aux_dir'."
+ pkgaux_header="putting auxiliary files in AC_CONFIG_AUX_DIR,
\`$subproject_aux_dir'."
elif test -n "$ac_aux_dir"; then
- pkgconfig_header="putting auxiliary files in \`$aux_dir'."
+ pkgaux_header="putting auxiliary files in \`$aux_dir'."
else
- pkgconfig_header="putting auxiliary files in \`$subproject_aux_dir'."
+ pkgaux_header="putting auxiliary files in \`$subproject_aux_dir'."
fi
- func_copy_some_files "$pkgconfig_files" \
- "$pkgdatadir" "$ltdl_dir" pkgconfig_header
+ func_copy_some_files "$pkgaux_files" \
+ "$pkgdatadir/config" "$ltdl_dir/config" pkgaux_header
}
-# func_install_pkgconfig_parent
+# func_install_pkgaux_parent
# Unless --quiet was passed, or AC_CONFIG_AUX_DIR was not seen, display a
# message. Then update appropriate auxiliary files if newer ones are
# available from the libtool installation tree.
-func_install_pkgconfig_parent ()
+func_install_pkgaux_parent ()
{
$debug_cmd
@@ -1085,35 +979,35 @@ func_install_pkgconfig_parent ()
# Remove any lingering files that my have been installed by some
# previous libtoolize release:
- $opt_force && for file in $all_pkgconfig_files; do
+ $opt_force && for file in $all_pkgaux_files; do
test -f "$aux_dir/$file" && func_verbose "rm -f '$aux_dir/$file'"
rm -f "$aux_dir/$file"
done
if test -n "$ac_aux_dir"; then
- pkgconfig_header="putting auxiliary files in AC_CONFIG_AUX_DIR,
\`$ac_aux_dir'."
+ pkgaux_header="putting auxiliary files in AC_CONFIG_AUX_DIR,
\`$ac_aux_dir'."
else
- pkgconfig_header="putting auxiliary files in \`$aux_dir'."
+ pkgaux_header="putting auxiliary files in \`$aux_dir'."
fi
if $opt_install; then
func_config_update config.guess \
- "$pkgdatadir/config" "$aux_dir" pkgconfig_header
+ "$pkgdatadir/config" "$aux_dir" pkgaux_header
func_config_update config.sub \
- "$pkgdatadir/config" "$aux_dir" pkgconfig_header
+ "$pkgdatadir/config" "$aux_dir" pkgaux_header
func_install_update install-sh \
- "$pkgdatadir/config" "$aux_dir" pkgconfig_header
+ "$pkgdatadir/config" "$aux_dir" pkgaux_header
fi
func_ltmain_update ltmain.sh \
- "$pkgdatadir/config" "$aux_dir" pkgconfig_header
+ "$pkgdatadir/config" "$aux_dir" pkgaux_header
}
-# func_install_pkgconfig_files
+# func_install_pkgaux_files
# Install copies of the auxiliary files into this package according to
# the whether libltdl is included as a subproject, and whether the parent
# shares the AC_CONFIG_AUX_DIR setting.
-func_install_pkgconfig_files ()
+func_install_pkgaux_files ()
{
$debug_cmd
@@ -1121,26 +1015,24 @@ func_install_pkgconfig_files ()
$require_configure_ac
$require_ltdl_mode
- func_massage_pkgconfig_files
-
# 1. Parent shares aux_dir with subproject ltdl:
if $opt_ltdl && test "x$ltdl_mode" = "xsubproject" &&
test "x$aux_dir" = "x$subproject_aux_dir"
then
- func_install_pkgconfig_subproject
+ func_install_pkgaux_subproject
# 2. Parent has separate aux_dir to subproject ltdl:
elif $opt_ltdl && test "x$ltdl_mode" = "xsubproject"
# && test "x$aux_dir" != "x$subproject_aux_dir" is implied
then
if test -n "$configure_ac"; then
- func_install_pkgconfig_parent
+ func_install_pkgaux_parent
fi
- func_install_pkgconfig_subproject
+ func_install_pkgaux_subproject
# 3. Not subproject, but AC_CONFIG_AUX_DIR was used in parent:
elif test -n "$ac_aux_dir" || test "x$aux_dir" = "x."; then
- func_install_pkgconfig_parent
+ func_install_pkgaux_parent
# 4. AC_CONFIG_AUX_DIR was not specified:
else
@@ -1197,17 +1089,17 @@ func_check_macros ()
my_ac_config_macro_srcdir="$subproject_macro_dir"
fi
- my_needed="libtool.m4 ltoptions.m4 ltversion.m4 ltsugar.m4
lt~obsolete.m4"
- $opt_ltdl && my_needed="$my_needed argz.m4 ltdl.m4"
-
- if test -f "aclocal.m4"; then
- for need in $my_needed; do
- func_aclocal_update_check $need
- $func_aclocal_update_check_result && my_missing="$my_missing $need"
- done
- else
- my_missing="$my_needed"
- fi
+ my_missing=
+ for file in $pkgmacro_files; do
+ case $file in
+ argz.m4|ltdl.m4) $opt_ltdl || continue ;;
+ esac
+ if test -f "aclocal.m4"; then
+ func_aclocal_update_check $file
+ $func_aclocal_update_check_result || continue
+ fi
+ my_missing="$my_missing $file"
+ done
if test -n "$my_missing"; then
func_echo "You should add the contents of the following files to
\`aclocal.m4':"
@@ -1705,10 +1597,17 @@ func_require_seen_libtool ()
# ensure a clean upgrade.
# Do not remove config.guess nor config.sub, we don't install them
# without --install, and the project may not be using Automake.
- all_pkgconfig_files="ltmain.sh"
+ all_pkgaux_files="compile install-sh depcomp missing ltmain.sh
snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h
snippet/warn-on-use.h"
all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4
ltversion.in ltversion.m4 lt~obsolete.m4"
all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am
README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure
configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h
libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h
libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h
loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c
loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c
lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h slist.c"
+ # Files installed by func_install_*, some files are missing from these
+ # lists deliberately because their respective func_install has to handle
+ # the missing filenames specially.
+ pkgaux_files="@pkgaux_files@"
+ pkgltdl_files="@pkgltdl_files@"
+ pkgmacro_files="@pkgmacro_files@"
+
# Locations for important files:
address@hidden@
address@hidden@
@@ -1731,7 +1630,7 @@ func_require_seen_libtool ()
# Allow the user to override the master libtoolize repository:
if test -n "$_lt_pkgdatadir"; then
- pkgltdldir="$_lt_pkgdatadir"
+ pkgltdldir="$_lt_pkgdatadir/libltdl"
pkgdatadir="$_lt_pkgdatadir/libltdl"
aclocaldir="$_lt_pkgdatadir/libltdl/m4"
fi
@@ -1758,7 +1657,7 @@ func_require_seen_libtool ()
$require_seen_ltdl
$seen_ltdl && opt_ltdl=:
- func_install_pkgconfig_files
+ func_install_pkgaux_files
func_install_pkgmacro_files
func_install_pkgltdl_files
diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index 77525f4..55520b5 100644
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -296,17 +296,10 @@ libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
libtoolize: putting libltdl files in `ltdl'.
libtoolize: copying file `ltdl/COPYING.LIB'
+libtoolize: creating file `ltdl/Makefile.inc'
libtoolize: copying file `ltdl/README'
libtoolize: copying file `ltdl/argz_.h'
libtoolize: copying file `ltdl/argz.c'
-libtoolize: copying file `ltdl/loaders/dld_link.c'
-libtoolize: copying file `ltdl/loaders/dlopen.c'
-libtoolize: copying file `ltdl/loaders/dyld.c'
-libtoolize: copying file `ltdl/loaders/load_add_on.c'
-libtoolize: copying file `ltdl/loaders/loadlibrary.c'
-libtoolize: copying file `ltdl/loaders/shl_load.c'
-libtoolize: copying file `ltdl/lt__dirent.c'
-libtoolize: copying file `ltdl/lt__strl.c'
libtoolize: copying file `ltdl/libltdl/lt__alloc.h'
libtoolize: copying file `ltdl/libltdl/lt__dirent.h'
libtoolize: copying file `ltdl/libltdl/lt__glibc.h'
@@ -316,14 +309,21 @@ libtoolize: copying file `ltdl/libltdl/lt_dlloader.h'
libtoolize: copying file `ltdl/libltdl/lt_error.h'
libtoolize: copying file `ltdl/libltdl/lt_system.h'
libtoolize: copying file `ltdl/libltdl/slist.h'
+libtoolize: copying file `ltdl/loaders/dld_link.c'
+libtoolize: copying file `ltdl/loaders/dlopen.c'
+libtoolize: copying file `ltdl/loaders/dyld.c'
+libtoolize: copying file `ltdl/loaders/load_add_on.c'
+libtoolize: copying file `ltdl/loaders/loadlibrary.c'
libtoolize: copying file `ltdl/loaders/preopen.c'
+libtoolize: copying file `ltdl/loaders/shl_load.c'
libtoolize: copying file `ltdl/lt__alloc.c'
+libtoolize: copying file `ltdl/lt__dirent.c'
+libtoolize: copying file `ltdl/lt__strl.c'
libtoolize: copying file `ltdl/lt_dlloader.c'
libtoolize: copying file `ltdl/lt_error.c'
libtoolize: copying file `ltdl/ltdl.c'
libtoolize: copying file `ltdl/ltdl.h'
libtoolize: copying file `ltdl/slist.c'
-libtoolize: creating file `ltdl/Makefile.inc'
libtoolize: Remember to add `LT_CONFIG_LTDL_DIR([ltdl])' to `configure.ac'.
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
]])
@@ -369,23 +369,15 @@ libtoolize: linking file `ltdl/m4/ltversion.m4'
libtoolize: linking file `ltdl/m4/lt~obsolete.m4'
libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, `ltdl'.
libtoolize: linking file `ltdl/COPYING.LIB'
-libtoolize: linking file `ltdl/README'
libtoolize: linking file `ltdl/Makefile.am'
-libtoolize: linking file `ltdl/configure.ac'
-libtoolize: copying file `ltdl/aclocal.m4'
libtoolize: linking file `ltdl/Makefile.in'
-libtoolize: linking file `ltdl/config-h.in'
-libtoolize: linking file `ltdl/configure'
+libtoolize: linking file `ltdl/README'
+libtoolize: copying file `ltdl/aclocal.m4'
libtoolize: linking file `ltdl/argz_.h'
libtoolize: linking file `ltdl/argz.c'
-libtoolize: linking file `ltdl/loaders/dld_link.c'
-libtoolize: linking file `ltdl/loaders/dlopen.c'
-libtoolize: linking file `ltdl/loaders/dyld.c'
-libtoolize: linking file `ltdl/loaders/load_add_on.c'
-libtoolize: linking file `ltdl/loaders/loadlibrary.c'
-libtoolize: linking file `ltdl/loaders/shl_load.c'
-libtoolize: linking file `ltdl/lt__dirent.c'
-libtoolize: linking file `ltdl/lt__strl.c'
+libtoolize: linking file `ltdl/config-h.in'
+libtoolize: linking file `ltdl/configure'
+libtoolize: linking file `ltdl/configure.ac'
libtoolize: linking file `ltdl/libltdl/lt__alloc.h'
libtoolize: linking file `ltdl/libltdl/lt__dirent.h'
libtoolize: linking file `ltdl/libltdl/lt__glibc.h'
@@ -395,8 +387,16 @@ libtoolize: linking file `ltdl/libltdl/lt_dlloader.h'
libtoolize: linking file `ltdl/libltdl/lt_error.h'
libtoolize: linking file `ltdl/libltdl/lt_system.h'
libtoolize: linking file `ltdl/libltdl/slist.h'
+libtoolize: linking file `ltdl/loaders/dld_link.c'
+libtoolize: linking file `ltdl/loaders/dlopen.c'
+libtoolize: linking file `ltdl/loaders/dyld.c'
+libtoolize: linking file `ltdl/loaders/load_add_on.c'
+libtoolize: linking file `ltdl/loaders/loadlibrary.c'
libtoolize: linking file `ltdl/loaders/preopen.c'
+libtoolize: linking file `ltdl/loaders/shl_load.c'
libtoolize: linking file `ltdl/lt__alloc.c'
+libtoolize: linking file `ltdl/lt__dirent.c'
+libtoolize: linking file `ltdl/lt__strl.c'
libtoolize: linking file `ltdl/lt_dlloader.c'
libtoolize: linking file `ltdl/lt_error.c'
libtoolize: linking file `ltdl/ltdl.c'
@@ -468,23 +468,15 @@ libtoolize: copying file `ltdl/m4/ltversion.m4'
libtoolize: copying file `ltdl/m4/lt~obsolete.m4'
libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, `ltdl'.
libtoolize: copying file `ltdl/COPYING.LIB'
-libtoolize: copying file `ltdl/README'
libtoolize: copying file `ltdl/Makefile.am'
-libtoolize: copying file `ltdl/configure.ac'
-libtoolize: copying file `ltdl/aclocal.m4'
libtoolize: copying file `ltdl/Makefile.in'
-libtoolize: copying file `ltdl/config-h.in'
-libtoolize: copying file `ltdl/configure'
+libtoolize: copying file `ltdl/README'
+libtoolize: copying file `ltdl/aclocal.m4'
libtoolize: copying file `ltdl/argz_.h'
libtoolize: copying file `ltdl/argz.c'
-libtoolize: copying file `ltdl/loaders/dld_link.c'
-libtoolize: copying file `ltdl/loaders/dlopen.c'
-libtoolize: copying file `ltdl/loaders/dyld.c'
-libtoolize: copying file `ltdl/loaders/load_add_on.c'
-libtoolize: copying file `ltdl/loaders/loadlibrary.c'
-libtoolize: copying file `ltdl/loaders/shl_load.c'
-libtoolize: copying file `ltdl/lt__dirent.c'
-libtoolize: copying file `ltdl/lt__strl.c'
+libtoolize: copying file `ltdl/config-h.in'
+libtoolize: copying file `ltdl/configure'
+libtoolize: copying file `ltdl/configure.ac'
libtoolize: copying file `ltdl/libltdl/lt__alloc.h'
libtoolize: copying file `ltdl/libltdl/lt__dirent.h'
libtoolize: copying file `ltdl/libltdl/lt__glibc.h'
@@ -494,8 +486,16 @@ libtoolize: copying file `ltdl/libltdl/lt_dlloader.h'
libtoolize: copying file `ltdl/libltdl/lt_error.h'
libtoolize: copying file `ltdl/libltdl/lt_system.h'
libtoolize: copying file `ltdl/libltdl/slist.h'
+libtoolize: copying file `ltdl/loaders/dld_link.c'
+libtoolize: copying file `ltdl/loaders/dlopen.c'
+libtoolize: copying file `ltdl/loaders/dyld.c'
+libtoolize: copying file `ltdl/loaders/load_add_on.c'
+libtoolize: copying file `ltdl/loaders/loadlibrary.c'
libtoolize: copying file `ltdl/loaders/preopen.c'
+libtoolize: copying file `ltdl/loaders/shl_load.c'
libtoolize: copying file `ltdl/lt__alloc.c'
+libtoolize: copying file `ltdl/lt__dirent.c'
+libtoolize: copying file `ltdl/lt__strl.c'
libtoolize: copying file `ltdl/lt_dlloader.c'
libtoolize: copying file `ltdl/lt_error.c'
libtoolize: copying file `ltdl/ltdl.c'
@@ -539,8 +539,8 @@ libtoolize: copying file `build-aux/ltmain.sh'
libtoolize: You should add the contents of the following files to `aclocal.m4':
libtoolize: `/usr/local/share/aclocal/libtool.m4'
libtoolize: `/usr/local/share/aclocal/ltoptions.m4'
-libtoolize: `/usr/local/share/aclocal/ltversion.m4'
libtoolize: `/usr/local/share/aclocal/ltsugar.m4'
+libtoolize: `/usr/local/share/aclocal/ltversion.m4'
libtoolize: `/usr/local/share/aclocal/lt~obsolete.m4'
libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
@@ -674,8 +674,8 @@ AT_DATA([expout],
libtoolize: copying file `./ltmain.sh'
libtoolize: You should add the contents of the following files to `aclocal.m4':
libtoolize: `/usr/local/share/aclocal/libtool.m4'
-libtoolize: `/usr/local/share/aclocal/ltversion.m4'
libtoolize: `/usr/local/share/aclocal/ltsugar.m4'
+libtoolize: `/usr/local/share/aclocal/ltversion.m4'
libtoolize: `/usr/local/share/aclocal/lt~obsolete.m4'
libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
@@ -798,17 +798,10 @@ libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, `ltdl'.
libtoolize: copying file `ltdl/COPYING.LIB'
+libtoolize: creating file `ltdl/Makefile.inc'
libtoolize: copying file `ltdl/README'
libtoolize: copying file `ltdl/argz_.h'
libtoolize: copying file `ltdl/argz.c'
-libtoolize: copying file `ltdl/loaders/dld_link.c'
-libtoolize: copying file `ltdl/loaders/dlopen.c'
-libtoolize: copying file `ltdl/loaders/dyld.c'
-libtoolize: copying file `ltdl/loaders/load_add_on.c'
-libtoolize: copying file `ltdl/loaders/loadlibrary.c'
-libtoolize: copying file `ltdl/loaders/shl_load.c'
-libtoolize: copying file `ltdl/lt__dirent.c'
-libtoolize: copying file `ltdl/lt__strl.c'
libtoolize: copying file `ltdl/libltdl/lt__alloc.h'
libtoolize: copying file `ltdl/libltdl/lt__dirent.h'
libtoolize: copying file `ltdl/libltdl/lt__glibc.h'
@@ -818,14 +811,21 @@ libtoolize: copying file `ltdl/libltdl/lt_dlloader.h'
libtoolize: copying file `ltdl/libltdl/lt_error.h'
libtoolize: copying file `ltdl/libltdl/lt_system.h'
libtoolize: copying file `ltdl/libltdl/slist.h'
+libtoolize: copying file `ltdl/loaders/dld_link.c'
+libtoolize: copying file `ltdl/loaders/dlopen.c'
+libtoolize: copying file `ltdl/loaders/dyld.c'
+libtoolize: copying file `ltdl/loaders/load_add_on.c'
+libtoolize: copying file `ltdl/loaders/loadlibrary.c'
libtoolize: copying file `ltdl/loaders/preopen.c'
+libtoolize: copying file `ltdl/loaders/shl_load.c'
libtoolize: copying file `ltdl/lt__alloc.c'
+libtoolize: copying file `ltdl/lt__dirent.c'
+libtoolize: copying file `ltdl/lt__strl.c'
libtoolize: copying file `ltdl/lt_dlloader.c'
libtoolize: copying file `ltdl/lt_error.c'
libtoolize: copying file `ltdl/ltdl.c'
libtoolize: copying file `ltdl/ltdl.h'
libtoolize: copying file `ltdl/slist.c'
-libtoolize: creating file `ltdl/Makefile.inc'
]])
AT_DATA([configure.ac],
@@ -885,23 +885,15 @@ libtoolize: copying file `ltdl/m4/ltversion.m4'
libtoolize: copying file `ltdl/m4/lt~obsolete.m4'
libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, `ltdl'.
libtoolize: copying file `ltdl/COPYING.LIB'
-libtoolize: copying file `ltdl/README'
libtoolize: copying file `ltdl/Makefile.am'
-libtoolize: copying file `ltdl/configure.ac'
-libtoolize: copying file `ltdl/aclocal.m4'
libtoolize: copying file `ltdl/Makefile.in'
-libtoolize: copying file `ltdl/config-h.in'
-libtoolize: copying file `ltdl/configure'
+libtoolize: copying file `ltdl/README'
+libtoolize: copying file `ltdl/aclocal.m4'
libtoolize: copying file `ltdl/argz_.h'
libtoolize: copying file `ltdl/argz.c'
-libtoolize: copying file `ltdl/loaders/dld_link.c'
-libtoolize: copying file `ltdl/loaders/dlopen.c'
-libtoolize: copying file `ltdl/loaders/dyld.c'
-libtoolize: copying file `ltdl/loaders/load_add_on.c'
-libtoolize: copying file `ltdl/loaders/loadlibrary.c'
-libtoolize: copying file `ltdl/loaders/shl_load.c'
-libtoolize: copying file `ltdl/lt__dirent.c'
-libtoolize: copying file `ltdl/lt__strl.c'
+libtoolize: copying file `ltdl/config-h.in'
+libtoolize: copying file `ltdl/configure'
+libtoolize: copying file `ltdl/configure.ac'
libtoolize: copying file `ltdl/libltdl/lt__alloc.h'
libtoolize: copying file `ltdl/libltdl/lt__dirent.h'
libtoolize: copying file `ltdl/libltdl/lt__glibc.h'
@@ -911,8 +903,16 @@ libtoolize: copying file `ltdl/libltdl/lt_dlloader.h'
libtoolize: copying file `ltdl/libltdl/lt_error.h'
libtoolize: copying file `ltdl/libltdl/lt_system.h'
libtoolize: copying file `ltdl/libltdl/slist.h'
+libtoolize: copying file `ltdl/loaders/dld_link.c'
+libtoolize: copying file `ltdl/loaders/dlopen.c'
+libtoolize: copying file `ltdl/loaders/dyld.c'
+libtoolize: copying file `ltdl/loaders/load_add_on.c'
+libtoolize: copying file `ltdl/loaders/loadlibrary.c'
libtoolize: copying file `ltdl/loaders/preopen.c'
+libtoolize: copying file `ltdl/loaders/shl_load.c'
libtoolize: copying file `ltdl/lt__alloc.c'
+libtoolize: copying file `ltdl/lt__dirent.c'
+libtoolize: copying file `ltdl/lt__strl.c'
libtoolize: copying file `ltdl/lt_dlloader.c'
libtoolize: copying file `ltdl/lt_error.c'
libtoolize: copying file `ltdl/ltdl.c'
@@ -963,23 +963,15 @@ libtoolize: linking file `ltdl/m4/ltversion.m4'
libtoolize: linking file `ltdl/m4/lt~obsolete.m4'
libtoolize: putting libltdl files in `ltdl'.
libtoolize: linking file `ltdl/COPYING.LIB'
-libtoolize: linking file `ltdl/README'
libtoolize: linking file `ltdl/Makefile.am'
-libtoolize: linking file `ltdl/configure.ac'
-libtoolize: copying file `ltdl/aclocal.m4'
libtoolize: linking file `ltdl/Makefile.in'
-libtoolize: linking file `ltdl/config-h.in'
-libtoolize: linking file `ltdl/configure'
+libtoolize: linking file `ltdl/README'
+libtoolize: copying file `ltdl/aclocal.m4'
libtoolize: linking file `ltdl/argz_.h'
libtoolize: linking file `ltdl/argz.c'
-libtoolize: linking file `ltdl/loaders/dld_link.c'
-libtoolize: linking file `ltdl/loaders/dlopen.c'
-libtoolize: linking file `ltdl/loaders/dyld.c'
-libtoolize: linking file `ltdl/loaders/load_add_on.c'
-libtoolize: linking file `ltdl/loaders/loadlibrary.c'
-libtoolize: linking file `ltdl/loaders/shl_load.c'
-libtoolize: linking file `ltdl/lt__dirent.c'
-libtoolize: linking file `ltdl/lt__strl.c'
+libtoolize: linking file `ltdl/config-h.in'
+libtoolize: linking file `ltdl/configure'
+libtoolize: linking file `ltdl/configure.ac'
libtoolize: linking file `ltdl/libltdl/lt__alloc.h'
libtoolize: linking file `ltdl/libltdl/lt__dirent.h'
libtoolize: linking file `ltdl/libltdl/lt__glibc.h'
@@ -989,8 +981,16 @@ libtoolize: linking file `ltdl/libltdl/lt_dlloader.h'
libtoolize: linking file `ltdl/libltdl/lt_error.h'
libtoolize: linking file `ltdl/libltdl/lt_system.h'
libtoolize: linking file `ltdl/libltdl/slist.h'
+libtoolize: linking file `ltdl/loaders/dld_link.c'
+libtoolize: linking file `ltdl/loaders/dlopen.c'
+libtoolize: linking file `ltdl/loaders/dyld.c'
+libtoolize: linking file `ltdl/loaders/load_add_on.c'
+libtoolize: linking file `ltdl/loaders/loadlibrary.c'
libtoolize: linking file `ltdl/loaders/preopen.c'
+libtoolize: linking file `ltdl/loaders/shl_load.c'
libtoolize: linking file `ltdl/lt__alloc.c'
+libtoolize: linking file `ltdl/lt__dirent.c'
+libtoolize: linking file `ltdl/lt__strl.c'
libtoolize: linking file `ltdl/lt_dlloader.c'
libtoolize: linking file `ltdl/lt_error.c'
libtoolize: linking file `ltdl/ltdl.c'
hooks/post-receive
--
GNU Libtool
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Libtool branch, master, updated. v2.4.2-62-gb544ca3,
Gary V. Vaughan <=