[svn] Update progress code to use higher timer resolution.

[wget] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 6b3b28e5a245df29a3a711feb2957491b17fd946..8a5b011353f41ef32978c7704f178c3e1590a9d1 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@
 
@@ -54,6 +66,7 @@ LDFLAGS = @LDFLAGS@
 #
 
 DISTNAME = wget-@VERSION@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 RM = rm -f
 
 # These are used for maintenance only, so they are safe without
@@ -72,7 +85,7 @@ infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
 SUBDIRS = src doc po util windows
 
 # default target
-all: src/config.h Makefile $(SUBDIRS)
+all: libtool src/config.h Makefile configure.bat $(SUBDIRS)
 
 check: all
 
@@ -80,7 +93,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:
@@ -94,13 +108,21 @@ 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.
+configure.bat: configure.bat.in
+       awk '{ print $$0 ($$0 ~ /\r$$/ ? "" : "\r") }' $@.in > $@
+
 # create tag files for Emacs
 TAGS:
        cd src && $(MAKE) $@
 
 dist: $(srcdir)/configure DISTFILES
        mkdir $(DISTNAME)
-       for d in `$(FIND) . -type d ! -name RCS -print`; do \
+       for d in `$(FIND) . -type d ! -name CVS -a ! -name RCS -print`; do \
                if [ "$$d" != "." -a "$$d" != "./$(DISTNAME)" ]; then \
                        mkdir $(DISTNAME)/$$d; \
                fi; \
@@ -117,7 +139,7 @@ dist: $(srcdir)/configure DISTFILES
 DISTFILES: FORCE
        rm -rf $(DISTNAME)      
        (cd $(srcdir); find . ! -type d -print) \
-       | sed '/\/RCS\//d; \
+       | sed '/\/\(CVS\|RCS\)\//d; \
                /$@/d; \
                /\.tar.*/d; \
                s/^.\///; /^\.$$/d;' \
@@ -138,6 +160,7 @@ distclean-top: clean-top
        $(RM) Makefile config.status config.log config.cache stamp-h
 
 realclean-top: distclean-top
+       $(RM) configure
 
 clean-recursive distclean-recursive realclean-recursive:
        for subdir in $(SUBDIRS); do \