[svn] Fixes to support out of the box compilation on various Windows compilers.

[wget] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 724a52268ea9bc17825dc26092af04249be8863d..ce8057963a61058b3a7c2ed47ff0f32d80cd15b0 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@
 #
@@ -56,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
@@ -74,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 $(SUBDIRS)
 
 check: all
 
@@ -97,6 +108,14 @@ 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) $@
@@ -136,9 +155,11 @@ 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) -r autom4te.cache
 
 realclean-top: distclean-top
        $(RM) configure