* ltmain.in (convenience, deplibs): propagate dependencies

	* libltdl/Makefile.am (noinst_HEADERS): don't install ltdl.h yet
	(noinst_LTLIBRARIES): ditto for libltdl.la

diff --git a/ChangeLog b/ChangeLog
index bf3a987b5dd5714a7144d91f9bfe3122e836b94d..1f804fe1630c3d25367418998e03a4c1880f5bbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-12-09  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * ltmain.in (convenience, deplibs): propagate dependencies
+       * libltdl/Makefile.am (noinst_HEADERS): don't install ltdl.h yet
+       (noinst_LTLIBRARIES): ditto for libltdl.la
+
 1998-12-08  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
 
        * README-alpha: adapted the release procedure from

diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index 480e92493a6f338909684e282c376fa5301d6214..496b2ca547fb9c672e2673df25e62f8d595fc225 100644 (file)
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -9,8 +9,8 @@ CFLAGS = -force-static
 
 EXTRA_DIST = acinclude.m4
 
-lib_LTLIBRARIES = libltdl.la
+noinst_LTLIBRARIES = libltdl.la
 libltdl_la_SOURCES = ltdl.c
 libltdl_la_LDFLAGS = $(LIBADD_DL) 
 
-include_HEADERS = ltdl.h
+noinst_HEADERS = ltdl.h

diff --git a/ltmain.in b/ltmain.in
index f0abf6d33f9237f084b34f54ccf0e197cee10c0f..b847d6ec1e9a0b2b69c6905faa1e036920990055 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -859,10 +859,11 @@ compiler."
 
         if test -z "$libdir"; then
          # It is a libtool convenience library, so add in its objects.
-         convenience="$convenience $dir/$old_library"l
+         convenience="$convenience $dir/$old_library"
          old_convenience="$old_convenience $dir/$old_library"
-         compile_command="$compile_command $dir/$old_library"
-         finalize_command="$finalize_command $dir/$old_library"
+         deplibs="$deplibs$dependency_libs"
+         compile_command="$compile_command $dir/$old_library$dependency_libs"
+         finalize_command="$finalize_command $dir/$old_library$dependency_libs"
          continue
        fi
 
@@ -1160,8 +1161,10 @@ compiler."
       oldlibs=
       if test -z "$rpath"; then
        # Building a libtool convenience library.
-       oldlibs="$output_objdir/$libname.al $oldlibs"
+        libext=al
+       oldlibs="$output_objdir/$libname.$libext $oldlibs"
        build_libtool_libs=convenience
+       dependency_libs="$deplibs"
 
        if test -n "$vinfo"; then
          $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2