X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2FMakefile.am;h=1de1ada6b5028d99a7955063bec21a5c60062024;hp=f0da4eee925a73f35bbba4c4fec8e55b6625f794;hb=58a9721edf16684ca99b1c301a4768ade07eb03b;hpb=ba909b24ec6f847b685e111a2cb753c496673824

diff --git a/src/Makefile.am b/src/Makefile.am
index f0da4eee..1de1ada6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
 # Makefile for `wget' utility
 # Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2004, 2005, 2006, 2007, 2008, 2009, 2010 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
@@ -36,42 +37,43 @@ endif
 
 # The following line is losing on some versions of make!
 DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
-LIBS     = @LIBSSL@ @LIBGNUTLS@ @LIBICONV@ @LIBINTL@ @LIBS@
+LIBS     = @LIBSSL@ @LIBGNUTLS@ @LIBICONV@ @LIBINTL@ @W32LIBS@ @LIBS@
 
 bin_PROGRAMS = wget
 wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c    		  \
-	       css.l css-url.c css-tokens.h \
+	       css.l css-url.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 snprintf.c spider.c url.c	          \
-	       utils.c $(IRI_OBJ)				          \
-	       css-url.h connect.h convert.h cookies.h	                  \
-	       ftp.h gen-md5.h hash.h host.h html-parse.h html-url.h      \
+	       utils.c exits.c build_info.c $(IRI_OBJ)			  \
+	       css-url.h css-tokens.h connect.h convert.h cookies.h       \
+	       ftp.h hash.h host.h html-parse.h html-url.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         \
-	       spider.h ssl.h sysdep.h url.h utils.h wget.h iri.h
-nodist_wget_SOURCES = build_info.c version.c
-EXTRA_wget_SOURCES = mswindows.c iri.c
-LDADD = $(LIBOBJS) ../lib/libgnu.a @MD5_LDADD@
-AM_CPPFLAGS = -I$(top_srcdir)/lib @MD5_CPPFLAGS@
+	       spider.h ssl.h sysdep.h url.h utils.h wget.h iri.h 	  \
+	       exits.h gettext.h
+nodist_wget_SOURCES = version.c
+EXTRA_wget_SOURCES = iri.c
+LDADD = $(LIBOBJS) ../lib/libgnu.a
+AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
 
 ../lib/libgnu.a:
 	cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
 
-../md5/libmd5.a:
-	cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
-
-build_info.c:  $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am
-	perl $(top_srcdir)/build_info.pl > $@
+build_info.c: $(srcdir)/Makefile.am $(srcdir)/build_info.c.in
+	if test -n "$(VPATH)"; then cp "$(srcdir)/build_info.c.in" .; fi
+	$(PERL) "$(top_srcdir)/build-aux/build_info.pl" \
+	    "$(abs_builddir)/build_info.c"
+	if test -n "$(VPATH)"; then rm -f build_info.c.in; fi
 
 ESCAPEQUOTE = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
-version.c:  $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am \
-    $(top_srcdir)/configure.ac
+version.c:  $(wget_SOURCES) ../lib/libgnu.a
 	echo '/* version.c */' > $@
 	echo '/* Autogenerated by Makefile - DO NOT EDIT */' >> $@
 	echo '' >> $@
 	echo 'const char *version_string = "@VERSION@"' >> $@
-	-hg log -r . --template='" ({node|short})"\n' 2>/dev/null >> $@
+	-hg log -R "$(top_srcdir)" -r . --template='" ({node|short})"\n' \
+	    2>/dev/null >> $@
 	echo ';' >> $@
 	echo 'const char *compilation_string = "'$(COMPILE)'";' \
 	    | $(ESCAPEQUOTE) >> $@
@@ -80,9 +82,9 @@ version.c:  $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am \
 	    | $(ESCAPEQUOTE) >> $@
 
 check_LIBRARIES = libunittest.a
-libunittest_a_SOURCES = $(wget_SOURCES) test.c test.h
-nodist_libunittest_a_SOURCES = build_info.c version.c
-libunittest_a_CPPFLAGS = -DTESTING -I$(top_srcdir)/lib
+libunittest_a_SOURCES = $(wget_SOURCES) test.c build_info.c test.h
+nodist_libunittest_a_SOURCES = version.c
+libunittest_a_CPPFLAGS = -DTESTING "-I$(top_builddir)/lib" "-I$(top_srcdir)/lib"
 libunittest_a_LIBADD = $(LIBOBJS)
 EXTRA_DIST = build_info.c.in