[svn] Merge of fix for bugs 20341 and 20410.

[wget] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 23058c03d63156aa33c18cfb358e8f5c627e07b3..8d7f9de817c47a0f0551a28f324885447ed955e6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
 # Makefile for `Wget' utility
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # In addition, as a special exception, the Free Software Foundation
 # gives permission to link the code of its release of Wget with the
@@ -57,7 +56,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
-LIBS = @LIBS@
+LIBS = @LIBS@ @LIBSSL@ @LIBGNUTLS@
 LDFLAGS = @LDFLAGS@
 
 #
@@ -66,7 +65,6 @@ LDFLAGS = @LDFLAGS@
 #
 
 DISTNAME = wget-@VERSION@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
 RM = rm -f
 
 # These are used for maintenance only, so they are safe without
@@ -78,15 +76,19 @@ TAR = tar
 # flags passed to recursive makes in subdirectories
 MAKEDEFS = CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' DEFS='$(DEFS)' \
 CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
-prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
-infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
+DESTDIR='$(DESTDIR)' prefix='$(prefix)' exec_prefix='$(exec_prefix)' \
+bindir='$(bindir)' infodir='$(infodir)' mandir='$(mandir)' \
+manext='$(manext)'
 
 # subdirectories in the distribution
-SUBDIRS = src doc po util windows
+SUBDIRS = src doc po tests util windows
 
 # default target
-all: libtool src/config.h Makefile $(SUBDIRS)
+all: src/config.h Makefile $(SUBDIRS)
 
+unittest: src/config.h Makefile 
+       cd tests && $(MAKE) $(MAKEDEFS) $@
+       
 check: all
 
 $(SUBDIRS): FORCE
@@ -108,21 +110,11 @@ 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).
-configure.bat: $(srcdir)/configure.bat.in
-       awk '{ print $$0 ($$0 ~ /\r$$/ ? "" : "\r") }' $< > $@
-
 # create tag files for Emacs
 TAGS:
        cd src && $(MAKE) $@
 
-dist: $(srcdir)/configure $(srcdir)/configure.bat DISTFILES
+dist: $(srcdir)/configure DISTFILES
        mkdir $(DISTNAME)
        for d in `$(FIND) . -type d ! -name CVS -a ! -name RCS -print`; do \
                if [ "$$d" != "." -a "$$d" != "./$(DISTNAME)" ]; then \
@@ -141,10 +133,7 @@ dist: $(srcdir)/configure $(srcdir)/configure.bat DISTFILES
 DISTFILES: FORCE
        rm -rf $(DISTNAME)      
        (cd $(srcdir); find . ! -type d -print) \
-       | sed '/\/\(CVS\|RCS\)\//d; \
-               /$@/d; \
-               /\.tar.*/d; \
-               s/^.\///; /^\.$$/d;' \
+       | sed '/\/\(CVS\|RCS\)\//d; /$@/d; /\.tar.*/d; s/^.\///; /^\.$$/d;' \
        | sort | uniq > $@
 
 #
@@ -157,14 +146,13 @@ 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 libtool stamp-h
        $(RM) -r autom4te.cache
 
 realclean-top: distclean-top
-       $(RM) configure configure.bat
+       $(RM) configure
 
 clean-recursive distclean-recursive realclean-recursive:
        for subdir in $(SUBDIRS); do \
@@ -176,22 +164,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: