X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2FMakefile.am;h=771318df4f8f634571eaa749f3495b8d78ef5361;hp=edbb592e8990422a8ae65d5954fa2c58d7aee599;hb=ab4c3117d19d4ad7ee52c2909065ece69b4bba83;hpb=44a22c78a76e6733dd4d420a236be0963f00f4c5

diff --git a/src/Makefile.am b/src/Makefile.am
index edbb592e..771318df 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile for `wget' utility
 # Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2004, 2005, 2006, 2007, 2008, 2009 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,31 +36,42 @@ endif
 
 # The following line is losing on some versions of make!
 DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
-LIBS     = @LIBSSL@ @LIBGNUTLS@ @LIBINTL@ @LIBS@
+LIBS     = @LIBSSL@ @LIBGNUTLS@ @LIBICONV@ @LIBINTL@ @LIBS@
 
 bin_PROGRAMS = wget
-wget_SOURCES = build_info.c cmpt.c connect.c convert.c cookies.c ftp.c    \
+wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c    		  \
 	       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	                  \
+	       utils.c exits.c $(IRI_OBJ)			          \
+	       css-url.h css-tokens.h connect.h convert.h cookies.h       \
 	       ftp.h gen-md5.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
-nodist_wget_SOURCES = version.c
-EXTRA_wget_SOURCES = mswindows.c
+	       spider.h ssl.h sysdep.h url.h utils.h wget.h iri.h 	  \
+	       exits.h gettext.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@
 
+../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 > $@
+
 ESCAPEQUOTE = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
-version.c:  $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am
+version.c:  $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am \
+    $(top_srcdir)/configure.ac
 	echo '/* version.c */' > $@
 	echo '/* Autogenerated by Makefile - DO NOT EDIT */' >> $@
 	echo '' >> $@
-	echo -n 'const char *version_string = "@VERSION@"' >> $@
+	echo 'const char *version_string = "@VERSION@"' >> $@
 	-hg log -r . --template='" ({node|short})"\n' 2>/dev/null >> $@
 	echo ';' >> $@
 	echo 'const char *compilation_string = "'$(COMPILE)'";' \
@@ -71,8 +82,9 @@ version.c:  $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am
 
 check_LIBRARIES = libunittest.a
 libunittest_a_SOURCES = $(wget_SOURCES) test.c test.h
-nodist_libunittest_a_SOURCES = version.c
+nodist_libunittest_a_SOURCES = build_info.c version.c
 libunittest_a_CPPFLAGS = -DTESTING -I$(top_srcdir)/lib
 libunittest_a_LIBADD = $(LIBOBJS)
+EXTRA_DIST = build_info.c.in
 
-CLEANFILES = *~ *.bak core core.[0-9]* version.c
+CLEANFILES = *~ *.bak core core.[0-9]* build_info.c version.c