[svn] Changed version number to 1.10-alpha3+cvs-dev after tagging version 1.10-alpha3...

[wget] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3756681a1ab63305eb2402291d77c544097458a7..bcf2ec099870fa8373c79a073dfd34698ad3748f 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@
 #
@@ -102,11 +112,17 @@ install.mo:
 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 DISTFILES
+dist: $(srcdir)/configure $(srcdir)/configure.bat DISTFILES
        mkdir $(DISTNAME)
        for d in `$(FIND) . -type d ! -name CVS -a ! -name RCS -print`; do \
                if [ "$$d" != "." -a "$$d" != "./$(DISTNAME)" ]; then \
@@ -141,12 +157,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
+       $(RM) configure configure.bat
 
 clean-recursive distclean-recursive realclean-recursive:
        for subdir in $(SUBDIRS); do \
@@ -158,22 +176,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 aclocal.m4
        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
+       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: