Merge with mainline

[wget] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 5a857ed502c6ab9fc7f7fd9a245649c6bdd9172f..24bc1cba3394df5db97d388ce89fcb5c7387260c 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,10 @@
 # Makefile for `wget' utility
-# Copyright (C) 1995-2005 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+# 2004, 2005, 2006, 2007 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 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with Wget; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with Wget.  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
@@ -53,7 +53,7 @@ DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(local
 CFLAGS   = @CFLAGS@
 LDFLAGS  = @LDFLAGS@ 
 LIBS     = @LIBS@ @LIBSSL@ @LIBGNUTLS@
-exeext   = @exeext@
+exeext   = @EXEEXT@
 
 INCLUDES = -I. -I$(srcdir)
 
@@ -76,8 +76,8 @@ OBJ = $(ALLOCA) cmpt.o connect.o convert.o cookies.o              \
       ftp.o ftp-basic.o ftp-ls.o $(OPIE_OBJ) $(GETOPT_OBJ) hash.o \
       host.o html-parse.o html-url.o http.o $(NTLM_OBJ) init.o    \
       log.o main.o $(MD5_OBJ) netrc.o progress.o ptimer.o recur.o \
-      res.o retr.o safe-ctype.o snprintf.o $(SSL_OBJ) url.o       \
-      utils.o version.o xmalloc.o
+      res.o retr.o safe-ctype.o snprintf.o spider.o $(SSL_OBJ)    \
+      url.o utils.o version.o xmalloc.o
 
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -96,31 +96,11 @@ wget$(exeext): $(OBJ)
 # time, and it's a lot safer than attempting to get all the
 # dependencies right.
 
-$(OBJ): config-post.h config.h connect.h convert.h cookies.h ftp.h   \
-        gen-md5.h getopt.h gnu-md5.h hash.h host.h html-parse.h      \
-        http-ntlm.h init.h log.h mswindows.h netrc.h options.h       \
-        progress.h ptimer.h recur.h res.h retr.h safe-ctype.h ssl.h  \
-        sysdep.h url.h utils.h wget.h xmalloc.h
-
-#
-# Dependencies for test binary
-#
-
-TESTOBJ = $(ALLOCA) cmpt.o connect.o convert.o cookies.o              \
-          ftp.o ftp-basic.o ftp-ls.o $(OPIE_OBJ) $(GETOPT_OBJ) hash.o \
-          host.o html-parse.o html-url.o http.o $(NTLM_OBJ) init.o    \
-          log.o main.o $(MD5_OBJ) netrc.o progress.o ptimer.o recur.o \
-          res.o retr.o safe-ctype.o snprintf.o $(SSL_OBJ) test.o      \
-         url.o utils.o version.o xmalloc.o
-
-$(TESTOBJ): config-post.h config.h connect.h convert.h cookies.h ftp.h   \
-            gen-md5.h getopt.h gnu-md5.h hash.h host.h html-parse.h      \
-            http-ntlm.h init.h log.h mswindows.h netrc.h options.h       \
-            progress.h ptimer.h recur.h res.h retr.h safe-ctype.h ssl.h  \
-            sysdep.h test.h url.h utils.h wget.h xmalloc.h
-
-test$(exeext): $(TESTOBJ)
-       $(LINK) $(TESTOBJ) $(LIBS)
+$(OBJ): config-post.h config.h connect.h convert.h cookies.h ftp.h \
+        gen-md5.h getopt.h gnu-md5.h hash.h host.h html-parse.h    \
+        http-ntlm.h init.h log.h mswindows.h netrc.h options.h     \
+        progress.h ptimer.h recur.h res.h retr.h safe-ctype.h      \
+        spider.h ssl.h sysdep.h url.h utils.h wget.h xmalloc.h
 
 #
 # Dependencies for installing