Merge with mainline

[wget] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 6a4a3e356cb9423562566c9c2053948e8f7b20be..24bc1cba3394df5db97d388ce89fcb5c7387260c 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,10 @@
 # Makefile for `wget' utility
-# Copyright (C) 1995, 1996, 1997 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 this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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
@@ -41,7 +41,8 @@ prefix       = @prefix@
 exec_prefix  = @exec_prefix@
 bindir       = @bindir@
 sysconfdir   = @sysconfdir@
-localedir    = $(prefix)/share/locale
+datadir      = @datadir@
+localedir    = $(datadir)/locale
 
 DESTDIR      =
 
@@ -50,14 +51,14 @@ CPPFLAGS = @CPPFLAGS@
 # The following line is losing on some versions of make!
 DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
 CFLAGS   = @CFLAGS@
-LDFLAGS  = @LDFLAGS@
-LIBS     = @LIBS@
-exeext   = @exeext@
+LDFLAGS  = @LDFLAGS@ 
+LIBS     = @LIBS@ @LIBSSL@ @LIBGNUTLS@
+exeext   = @EXEEXT@
 
-INCLUDES = -I. -I$(srcdir) @SSL_INCLUDES@
+INCLUDES = -I. -I$(srcdir)
 
 COMPILE = $(CC) $(INCLUDES) $(CPPFLAGS)  $(DEFS) $(CFLAGS)
-LINK    = @LIBTOOL@ --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+LINK    = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 RM = rm -f
@@ -75,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
@@ -95,11 +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
+$(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
@@ -122,7 +123,6 @@ uninstall.bin:
 
 clean:
        $(RM) *.o wget$(exeext) *~ *.bak core core.[0-9]*
-       $(RM) -r .libs
 
 distclean: clean
        $(RM) Makefile config.h