[svn] Don't generate configure.bat, just use it.

[wget] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7a672fb4e8cb0b3e8e02bf7a61a830dbeba583af..54acb2c1592ae2f7f20203a6092e1467779bf223 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,6 +15,16 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+# In addition, as a special exception, the Free Software Foundation
+# gives permission to link the code of its release of Wget with the
+# OpenSSL project's "OpenSSL" library (or with modified versions of it
+# that use the same license as the "OpenSSL" library), and distribute
+# the linked executables.  You must obey the GNU General Public License
+# in all respects for all of the code used other than "OpenSSL".  If you
+# modify this file, you may extend this exception to your version of the
+# file, but you are not obligated to do so.  If you do not wish to do
+# so, delete this exception statement from your version.
+
 #
 # Version: @VERSION@
 #
@@ -22,6 +32,8 @@
 SHELL = /bin/sh
 @SET_MAKE@
 
+top_builddir = .
+
 srcdir = @srcdir@
 VPATH  = @srcdir@
 
@@ -45,7 +57,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
-LIBS = @LIBS@
+LIBS = @LIBS@ @LIBSSL@
 LDFLAGS = @LDFLAGS@
 
 #
@@ -80,7 +92,8 @@ $(SUBDIRS): FORCE
        cd $@ && $(MAKE) $(MAKEDEFS)
 
 # install everything
-install: install.bin install.info install.wgetrc install.mo # install.man
+install: install.bin install.info install.wgetrc \
+        install.mo @COMMENT_IF_NO_POD2MAN@install.man
 
 # install/uninstall the binary
 install.bin uninstall.bin:
@@ -133,11 +146,14 @@ realclean:        realclean-recursive     realclean-top
 
 clean-top:
        $(RM) *~ *.bak $(DISTNAME).tar.gz
+       $(RM) -r .libs
 
 distclean-top: clean-top
-       $(RM) Makefile config.status config.log config.cache stamp-h
+       $(RM) Makefile config.status config.log config.cache libtool stamp-h
+       $(RM) -r autom4te.cache
 
 realclean-top: distclean-top
+       $(RM) configure
 
 clean-recursive distclean-recursive realclean-recursive:
        for subdir in $(SUBDIRS); do \
@@ -149,22 +165,23 @@ clean-recursive distclean-recursive realclean-recursive:
 # Dependencies for maintenance
 #
 
-Makefile: Makefile.in config.status
-       CONFIG_HEADERS= ./config.status
-
-config.status: configure
-       ./config.status --recheck
-
-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
+       @true; # running autoheader here breaks: cd $(srcdir) && autoheader
+       echo timestamp > $(srcdir)/stamp-h.in
+
 src/config.h: stamp-h
 stamp-h: src/config.h.in config.status
-       CONFIG_FILES= CONFIG_HEADERS=src/config.h ./config.status
+       ./config.status
 
-src/config.h.in: stamp-h.in
-stamp-h.in: configure.in aclocal.m4
-       echo timestamp > $@
+Makefile: Makefile.in config.status
+       ./config.status
 
-FORCE:
+config.status: configure
+       ./config.status --recheck
 
+FORCE: