From: hniksic Date: Thu, 23 Jun 2005 01:03:16 +0000 (-0700) Subject: [svn] Replaced the non-standard Makefile.svn with autogen.sh. X-Git-Tag: v1.13~949 X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=72eda236daab07f08a64b207fd879577d89c0f53 [svn] Replaced the non-standard Makefile.svn with autogen.sh. --- diff --git a/ChangeLog b/ChangeLog index cadb15aa..01c8978a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-06-22 Hrvoje Niksic + + * autogen.sh: New file. + + * Makefile.svn: Deleted, replaced with the even simpler (and more + standard) `autogen.sh' script. + 2005-06-22 Hrvoje Niksic * configure.in: Don't check for signal.h. Remove the diff --git a/Makefile.svn b/Makefile.svn deleted file mode 100644 index 665ab142..00000000 --- a/Makefile.svn +++ /dev/null @@ -1,52 +0,0 @@ -# Makefile for preparing the sources after Subversion checkout. -# Copyright (C) 2000 Karl Eichwalder. - -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -# 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. - -# -# Usage: -# -# make -f Makefile.svn -# - -SHELL = /bin/sh - -prep: - autoheader - autoconf - -# The following two targets are pretty lame because we don't know that -# the user wants to configure in `.', just like we don't know whether -# the `make' program is called `make'. I'm keeping them for the sake -# of the users who expect to find them. I don't want to make this -# file complicated by implementing smarter detections -- the user who -# needs different behavior should simply run `make -f Makefile.svn' -# and proceed as he would have normally. - -configure: prep - ./configure - -make: configure - make diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 00000000..3216c900 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,37 @@ +#!/bin/sh -x + +# The (trivial) script for preparing the sources following the +# checkout from version control. +# Copyright (C) 2005 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +# 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. + +autoheader +autoconf + +# We intentionally don't invoke configure and make because we don't +# know where the user wants to run the configuration, nor with which +# arguments. That is entirely up to the user. +