1 files changed, 20 insertions, 31 deletions

diff --git a/libltdl/Makefile.in b/libltdl/Makefile.in
index 0f077113..f00684f6 100644
--- a/libltdl/Makefile.in
+++ b/libltdl/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -37,7 +37,6 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = README $(am__configure_deps) $(am__include_HEADERS_DIST) \
         $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \
@@ -51,15 +50,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(mkdir_p)
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
@@ -67,21 +60,19 @@ am__DEPENDENCIES_1 =
 libltdl_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libltdl_la_OBJECTS = ltdl.lo
 libltdl_la_OBJECTS = $(am_libltdl_la_OBJECTS)
-@INSTALL_LTDL_TRUE@am_libltdl_la_rpath = -rpath $(libdir)
 libltdlc_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libltdlc_la_OBJECTS = ltdl.lo
 libltdlc_la_OBJECTS = $(am_libltdlc_la_OBJECTS)
-@CONVENIENCE_LTDL_TRUE@am_libltdlc_la_rpath =
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
 depcomp =
 am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
         $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
         $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES)
 DIST_SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES)
@@ -183,8 +174,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -284,7 +273,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
         test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
         @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
           if test -f $$p; then \
-            f=$(am__strip_dir) \
+            f="`echo $$p | sed -e 's|^.*/||'`"; \
             echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
             $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
           else :; fi; \
@@ -292,8 +281,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 
 uninstall-libLTLIBRARIES:
         @$(NORMAL_UNINSTALL)
-        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-          p=$(am__strip_dir) \
+        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+            p="`echo $$p | sed -e 's|^.*/||'`"; \
           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
         done
@@ -316,9 +305,9 @@ clean-noinstLTLIBRARIES:
           rm -f "$${dir}/so_locations"; \
         done
 libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES) 
-        $(LINK) $(am_libltdl_la_rpath) $(libltdl_la_LDFLAGS) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS)
+        $(LINK) -rpath $(libdir) $(libltdl_la_LDFLAGS) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS)
 libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES) 
-        $(LINK) $(am_libltdlc_la_rpath) $(libltdlc_la_LDFLAGS) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS)
+        $(LINK)  $(libltdlc_la_LDFLAGS) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
         -rm -f *.$(OBJEXT)
@@ -349,7 +338,7 @@ install-includeHEADERS: $(include_HEADERS)
         test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
         @list='$(include_HEADERS)'; for p in $$list; do \
           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          f=$(am__strip_dir) \
+          f="`echo $$p | sed -e 's|^.*/||'`"; \
           echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
           $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
         done
@@ -357,7 +346,7 @@ install-includeHEADERS: $(include_HEADERS)
 uninstall-includeHEADERS:
         @$(NORMAL_UNINSTALL)
         @list='$(include_HEADERS)'; for p in $$list; do \
-          f=$(am__strip_dir) \
+          f="`echo $$p | sed -e 's|^.*/||'`"; \
           echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
           rm -f "$(DESTDIR)$(includedir)/$$f"; \
         done
@@ -445,15 +434,15 @@ distdir: $(DISTFILES)
           ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
         || chmod -R a+r $(distdir)
 dist-gzip: distdir
-        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+        $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
         $(am__remove_distdir)
 
 dist-bzip2: distdir
-        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+        $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
         $(am__remove_distdir)
 
 dist-tarZ: distdir
-        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+        $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
         $(am__remove_distdir)
 
 dist-shar: distdir
@@ -466,7 +455,7 @@ dist-zip: distdir
         $(am__remove_distdir)
 
 dist dist-all: distdir
-        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+        $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
         $(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -475,11 +464,11 @@ dist dist-all: distdir
 distcheck: dist
         case '$(DIST_ARCHIVES)' in \
         *.tar.gz*) \
-          GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+          GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
         *.tar.bz2*) \
-          bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+          bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
         *.tar.Z*) \
-          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+          uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
         *.shar.gz*) \
           GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
         *.zip*) \
@@ -563,7 +552,7 @@ clean-generic:
         -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+        -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
         @echo "This command is intended for maintainers to use"