[svn] Added Nicolas Schodet.

[wget] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 97f2239ddf320d200bb1ac63379ec1b24eb53ffa..ef584e5e9ec2eb23a39b0431602e48903aa1ed99 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -113,14 +113,16 @@ libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
 # Create configure.bat from configure.bat.in by DOS-ifying the lines.
-configure.bat: configure.bat.in
-       awk '{ print $$0 ($$0 ~ /\r$$/ ? "" : "\r") }' $@.in > $@
+# 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 \
@@ -155,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 \
@@ -172,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
+       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: