X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=451754914cb07dc09c58183c7c383ac621e09b04;hb=e72b57629bf49cdfd663002a8bb336a67b958979;hp=361de3c70ca9cdc635b8248d6a4961a8470c4d18;hpb=68740f10dd55cb272bcad0bd0c5199bbdef5b26e;p=wget

diff --git a/src/Makefile.am b/src/Makefile.am
index 361de3c7..45175491 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 Free Software Foundation, Inc.
+# 2004, 2005, 2006, 2007, 2008 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
@@ -15,15 +15,16 @@
 # You should have received a copy of the GNU General Public License
 # along with Wget.  If not, see <http://www.gnu.org/licenses/>.
 
-# In addition, as a special exception, the Free Software Foundation
-# gives permission to link the code of its release of Wget with the
-# OpenSSL project's "OpenSSL" library (or with modified versions of it
-# that use the same license as the "OpenSSL" library), and distribute
-# the linked executables.  You must obey the GNU General Public License
-# in all respects for all of the code used other than "OpenSSL".  If you
-# modify this file, you may extend this exception to your version of the
-# file, but you are not obligated to do so.  If you do not wish to do
-# so, delete this exception statement from your version.
+# Additional permission under GNU GPL version 3 section 7
+
+# If you modify this program, or any covered work, by linking or
+# combining it with the OpenSSL project's OpenSSL library (or a
+# modified version of that library), containing parts covered by the
+# terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+# grants you additional permission to convey the resulting work.
+# Corresponding Source for a non-source form of such a combination
+# shall include the source code for the parts of OpenSSL used as well
+# as that of the covered work.
 
 #
 # Version: @VERSION@
@@ -31,36 +32,33 @@
 
 # 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 version.c xmalloc.c				\
-	       config-post.h connect.h convert.h cookies.h 		\
+	       utils.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
+	       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
-AM_CPPFLAGS = -I$(top_srcdir)/lib
-
-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' '";' >> $@
+LDADD = $(LIBOBJS) ../lib/libgnu.a @MD5_LDADD@
+AM_CPPFLAGS = -I$(top_srcdir)/lib @MD5_CPPFLAGS@
 
-.INTERMEDIATE: hg-id
-.PHONY: hg-id
-hg-id: $(wget_SOURCES) $(LDADD)
-	-( hg id | cut -f 1 -d ' ' ) 2>/dev/null > $@
+version.c:  $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am
+	echo 'const char *version_string = "@VERSION@"' > $@
+	-hg log -r . --template='" ({node|short})"\n' 2>/dev/null >> $@
+	echo ';' >> $@
 
 check_LIBRARIES = libunittest.a
 libunittest_a_SOURCES = $(wget_SOURCES) test.c test.h
-libunittest_a_CPPFLAGS = -DTESTING
-libunittest_a_LIBADD = $(ALLOCA) $(LIBOBJS)
+nodist_libunittest_a_SOURCES = version.c
+libunittest_a_CPPFLAGS = -DTESTING -I$(top_srcdir)/lib
+libunittest_a_LIBADD = $(LIBOBJS)
 
-CLEANFILES = *~ *.bak core core.[0-9]*
+CLEANFILES = *~ *.bak core core.[0-9]* version.c