[svn] Removed libtool and switched to config.rpath to perform configuration-time...

[wget] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index e1e23aa5ccd6e063e923950a4fe55282d750aa46..1fd5c7af58c73420d741a42b154c2736d51c7586 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -50,14 +50,15 @@ 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@
+LDFLAGS  = @LDFLAGS@ 
+LIBS     = @LIBS@ @LIBSSL@
 exeext   = @exeext@
 
-INCLUDES = -I. -I$(srcdir) @SSL_INCLUDES@
+#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
@@ -76,7 +77,7 @@ OBJ = $(ALLOCA) cmpt.o connect.o convert.o cookies.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 
+      utils.o version.o xmalloc.o
 
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -89,6 +90,18 @@ OBJ = $(ALLOCA) cmpt.o connect.o convert.o cookies.o              \
 wget$(exeext): $(OBJ)
        $(LINK) $(OBJ) $(LIBS)
 
+# We make object files depend on every header.  Rather than attempt to
+# track dependencies, everything gets recompiled when a header
+# changes.  With a program of Wget's size this doesn't waste much
+# 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 installing
 #
@@ -129,50 +142,3 @@ Makefile: Makefile.in ../config.status
 
 TAGS: *.c *.h
        -$(ETAGS) *.c *.h
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-alloca.o:
-cmpt.o: wget.h sysdep.h options.h safe-ctype.h
-connect.o: wget.h sysdep.h options.h safe-ctype.h utils.h connect.h host.h
-convert.o: wget.h convert.h url.h recur.h utils.h hash.h
-cookies.o: wget.h sysdep.h options.h safe-ctype.h cookies.h hash.h url.h utils.h
-ftp-basic.o: wget.h sysdep.h options.h safe-ctype.h utils.h connect.h \
-       host.h ftp.h
-ftp-ls.o: wget.h sysdep.h options.h safe-ctype.h utils.h ftp.h host.h \
-       url.h
-ftp-opie.o: wget.h sysdep.h options.h safe-ctype.h gen-md5.h
-ftp.o: wget.h sysdep.h options.h safe-ctype.h utils.h url.h retr.h \
-       ftp.h host.h connect.h netrc.h
-gen-md5.o: wget.h sysdep.h options.h safe-ctype.h gen-md5.h
-openssl.o: wget.h sysdep.h options.h safe-ctype.h utils.h connect.h host.h \
-       url.h
-getopt.o: wget.h sysdep.h options.h safe-ctype.h getopt.h
-gnu-md5.o: wget.h sysdep.h options.h safe-ctype.h gnu-md5.h
-hash.o: wget.h sysdep.h options.h safe-ctype.h utils.h hash.h
-host.o: wget.h sysdep.h options.h safe-ctype.h utils.h host.h url.h hash.h
-html-parse.o: wget.h sysdep.h options.h safe-ctype.h html-parse.h
-html-url.o: wget.h sysdep.h options.h safe-ctype.h html-parse.h url.h utils.h
-http.o: wget.h sysdep.h options.h safe-ctype.h utils.h url.h host.h \
-       retr.h connect.h host.h netrc.h ssl.h \
-       cookies.h gen-md5.h
-init.o: wget.h sysdep.h options.h safe-ctype.h utils.h init.h host.h recur.h \
-       netrc.h cookies.h progress.h
-log.o: wget.h sysdep.h options.h safe-ctype.h utils.h
-main.o: wget.h sysdep.h options.h safe-ctype.h utils.h init.h retr.h \
-       recur.h host.h cookies.h url.h progress.h ssl.h getopt.h
-gnu-md5.o: wget.h sysdep.h options.h safe-ctype.h gnu-md5.h
-mswindows.o: wget.h sysdep.h options.h safe-ctype.h utils.h url.h
-netrc.o: wget.h sysdep.h options.h safe-ctype.h utils.h netrc.h init.h
-progress.o: wget.h sysdep.h options.h safe-ctype.h progress.h utils.h retr.h
-recur.o: wget.h sysdep.h options.h safe-ctype.h url.h recur.h utils.h retr.h \
-       ftp.h host.h hash.h
-res.o: wget.h sysdep.h options.h safe-ctype.h utils.h hash.h url.h retr.h res.h
-retr.o: wget.h sysdep.h options.h safe-ctype.h utils.h retr.h url.h \
-       recur.h ftp.h host.h connect.h hash.h
-safe-ctype.o: safe-ctype.h
-snprintf.o: safe-ctype.h
-url.o: wget.h sysdep.h options.h safe-ctype.h utils.h url.h host.h hash.h
-utils.o: wget.h sysdep.h options.h safe-ctype.h utils.h hash.h
-version.o:
-xmalloc.o: wget.h xmalloc.h