[svn] Updated ChangeLog for config.rpath patch.

[wget] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index ef584e5e9ec2eb23a39b0431602e48903aa1ed99..ed7ed8bd656996d8bfb4531cf06f3fdf184f333c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,7 +57,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
-LIBS = @LIBS@
+LIBS = @LIBS@ @LIBSSL@
 LDFLAGS = @LDFLAGS@
 
 #
@@ -66,7 +66,6 @@ LDFLAGS = @LDFLAGS@
 #
 
 DISTNAME = wget-@VERSION@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
 RM = rm -f
 
 # These are used for maintenance only, so they are safe without
@@ -85,7 +84,7 @@ infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
 SUBDIRS = src doc po util windows
 
 # default target
-all: libtool src/config.h Makefile $(SUBDIRS)
+all: src/config.h Makefile $(SUBDIRS)
 
 check: all
 
@@ -108,10 +107,6 @@ install.info uninstall.info install.man uninstall.man install.wgetrc:
 install.mo:
        cd po && $(MAKE) $(MAKEDEFS) $@
 
-# Regenerate libtool if ltconfig and/or ltmain are updated
-libtool: $(LIBTOOL_DEPS)
-       $(SHELL) ./config.status --recheck
-
 # Create configure.bat from configure.bat.in by DOS-ifying the lines.
 # This is invoked by `make dist' and deleted by `make realclean' (not
 # `make distclean' because we want to preserve it for distribution).
@@ -176,13 +171,13 @@ clean-recursive distclean-recursive realclean-recursive:
 # Dependencies for maintenance
 #
 
-$(srcdir)/configure: configure.in aclocal.m4
+$(srcdir)/configure: configure.in
        cd $(srcdir) && autoconf
 
 # autoheader might not change config.h.in, so touch a stamp file.
 $(srcdir)/src/config.h.in: stamp-h.in
-$(srcdir)/stamp-h.in: configure.in aclocal.m4
-       cd $(srcdir) && autoheader
+$(srcdir)/stamp-h.in: configure.in
+       @true; # running autoheader here breaks: cd $(srcdir) && autoheader
        echo timestamp > $(srcdir)/stamp-h.in
 
 src/config.h: stamp-h