X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=ab830ba080a828041ed65d92a7371901ade35618;hb=090f1596ae2eb446c265a62849f59657a9ee9e07;hp=f598d9084eb1d82791da472388741cccb1b30d24;hpb=bc8f473272ec29b0d0021dbcab6ac561ddc6249d;p=wget

diff --git a/src/Makefile.am b/src/Makefile.am
index f598d908..ab830ba0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,35 +30,55 @@
 # Version: @VERSION@
 #
 
+if IRI_IS_ENABLED
+IRI_OBJ = iri.c
+endif
+
 # The following line is losing on some versions of make!
 DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
-LIBS     = @LIBS@ @LIBSSL@ @LIBGNUTLS@ @LIBINTL@
+LIBS     = @LIBSSL@ @LIBGNUTLS@ @LIBINTL@ @LIBS@
 
 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 snprintf.c spider.c url.c	\
-	       utils.c xmalloc.c				\
-	       connect.h convert.h cookies.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 \
-	       spider.h ssl.h sysdep.h url.h utils.h wget.h xmalloc.h
+wget_SOURCES = build_info.c 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	                  \
+	       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
-LDADD = $(ALLOCA) $(LIBOBJS) ../lib/libgnu.a @MD5_LDADD@
-AM_CPPFLAGS = -I $(top_srcdir)/lib @MD5_CPPFLAGS@
+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)
 
+ESCAPEQUOTE = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
 version.c:  $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am
-	echo 'const char *version_string = "@VERSION@"' > $@
+	echo '/* version.c */' > $@
+	echo '/* Autogenerated by Makefile - DO NOT EDIT */' >> $@
+	echo '' >> $@
+	echo -n 'const char *version_string = "@VERSION@"' >> $@
 	-hg log -r . --template='" ({node|short})"\n' 2>/dev/null >> $@
 	echo ';' >> $@
+	echo 'const char *compilation_string = "'$(COMPILE)'";' \
+	    | $(ESCAPEQUOTE) >> $@
+	echo 'const char *link_string = "'$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) $(LIBS) $(wget_LDADD)'";' \
+	    | $(ESCAPEQUOTE) >> $@
 
 check_LIBRARIES = libunittest.a
 libunittest_a_SOURCES = $(wget_SOURCES) test.c test.h
 nodist_libunittest_a_SOURCES = version.c
 libunittest_a_CPPFLAGS = -DTESTING -I$(top_srcdir)/lib
-libunittest_a_LIBADD = $(ALLOCA) $(LIBOBJS)
+libunittest_a_LIBADD = $(LIBOBJS)
 
 CLEANFILES = *~ *.bak core core.[0-9]* version.c