X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=Makefile.am;h=7a500ba0c1eecdc69d20db8bafccb63a4d6bf080;hp=014ea96adfb764640ed1c1ec3a4523457f99cd19;hb=320cfdcb658e8d6556ae9dfd902c2db1db866a6b;hpb=93538d26c707d570fab5c75f819eeeb3830632df

diff --git a/Makefile.am b/Makefile.am
index 014ea96a..7a500ba0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 # Makefile for `Wget' utility
-# Copyright (C) 1995, 1996, 1997, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2006, 2007, 2008, 2009, 2010, 2011
+# 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
@@ -14,51 +15,50 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  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@
 #
 
+
+# We can't help that installing wget.info leaves /usr/share/info/dir
+# around, and we need to prevent uninstallation of the possibly
+# previously-existing /etc/wgetrc.
+distuninstallcheck_listfiles = find . -type f | \
+			       grep -Ev '(/share/info/dir|/etc/wgetrc)$$'
+
 # Search for macros in the m4 subdirectory:
 ACLOCAL_AMFLAGS = -I m4
 
-# These are used for maintenance only, so they are safe without
-# special autoconf cruft.
-RM = rm -f
-
 # subdirectories in the distribution
-SUBDIRS = src doc po tests util windows
-
-test: all
-	cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
+SUBDIRS = lib src doc po tests util
 
-EXTRA_DIST = autogen.sh ChangeLog.README configure.bat MAILING-LIST PATCHES \
-	     README.checkout
+EXTRA_DIST = ChangeLog.README MAILING-LIST \
+             msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \
+             msdos/Makefile.WC ABOUT-NLS \
+             build-aux/build_info.pl build-aux/git-version-gen .version
 
-#
-# Cleanup dependencies
-#
+CLEANFILES = *~ *.bak $(DISTNAME).tar.gz
 
-realclean:	realclean-recursive	realclean-top
+BUILT_SOURCES = .version
 
-CLEANFILES = *~ *.bak $(DISTNAME).tar.gz
-distclean-local:
-	$(RM) -r autom4te.cache
+clean-generic:
+	rm -f install-info
 
-realclean-top: distclean-am
-	$(RM) configure
+.version:
+	echo $(VERSION) > $@-t && mv $@-t $@
 
-realclean-recursive:
-	for subdir in $(SUBDIRS); do \
-	   target=`echo $@ | sed s/-recursive//`; \
-	   (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) || exit 1; \
-	done
+# Arrange so that .tarball-version appears only in the distribution
+# tarball, and never in a checked-out repository.
+dist-hook:
+	$(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version