X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2FMakefile.am;h=361de3c70ca9cdc635b8248d6a4961a8470c4d18;hp=dcc19c816d0f31cf7f1afdf0046b045986a80a26;hb=33880205d7bd4f6bff9e0b2ff6d5f5d3952e0fe4;hpb=fbe701ce28278fd58f67464518ece3f26882a2fa

diff --git a/src/Makefile.am b/src/Makefile.am
index dcc19c81..361de3c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,25 +37,25 @@ bin_PROGRAMS = wget
 wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c ftp-basic.c	\
 	       ftp-ls.c hash.c host.c html-parse.c html-url.c http.c	\
 	       init.c log.c main.c netrc.c progress.c ptimer.c recur.c	\
-	       res.c retr.c safe-ctype.c snprintf.c spider.c url.c	\
+	       res.c retr.c snprintf.c spider.c url.c	\
 	       utils.c version.c xmalloc.c				\
 	       config-post.h connect.h convert.h cookies.h 		\
-	       ftp.h gen-md5.h getopt.h gnu-md5.h hash.h host.h html-parse.h \
+	       ftp.h gen-md5.h hash.h host.h html-parse.h \
 	       http.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 \
+	       options.h progress.h ptimer.h recur.h res.h retr.h \
 	       spider.h ssl.h sysdep.h url.h utils.h wget.h xmalloc.h
 EXTRA_wget_SOURCES = mswindows.c
-LDADD = $(ALLOCA) $(LIBOBJS)
+LDADD = $(ALLOCA) $(LIBOBJS) ../lib/libgnu.a
+AM_CPPFLAGS = -I$(top_srcdir)/lib
 
-# version.c's not really _phony_, but it does need to be generated each run.
-.PHONY: version.c
 version.c: hg-id
 	printf '%s' 'const char *version_string = "@VERSION@' > $@
 	-HG_ID=$$(cat hg-id); [ "$$HG_ID" ] && printf '%s' " ($${HG_ID})" >> $@
 	printf '%s\n' '";' >> $@
 
 .INTERMEDIATE: hg-id
-hg-id:
+.PHONY: hg-id
+hg-id: $(wget_SOURCES) $(LDADD)
 	-( hg id | cut -f 1 -d ' ' ) 2>/dev/null > $@
 
 check_LIBRARIES = libunittest.a