From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9152 invoked by alias); 12 Feb 2020 05:26:16 -0000 Mailing-List: contact cgen-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cgen-owner@sourceware.org Received: (qmail 9144 invoked by uid 89); 12 Feb 2020 05:26:15 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.1 spammy=Maintenance X-HELO: mail-pg1-f174.google.com Received: from mail-pg1-f174.google.com (HELO mail-pg1-f174.google.com) (209.85.215.174) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 12 Feb 2020 05:26:05 +0000 Received: by mail-pg1-f174.google.com with SMTP id j4so598063pgi.1 for ; Tue, 11 Feb 2020 21:26:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=mOv7SN7kPWWMBAMsTMdl5YDN7oIrLCy7OYCmH/TTnuc=; b=pmYTsWYe6xyBtUvAkPzq808IrUUoY2cci8yfk0456rHqGVg3IuuLo348yUMBihC7IP srtydHBcwOwpgREhTojqm//rPTQ9vuWR/K1WwHKpRs1NXBefssorBsnvG4JUl02z5C31 I2LmyTfZZb9LzUAgzjB9S5YApZA/qPVupGGksOqRhut46ORka9fwDqJKTdvLLdb6EG4a UPRIKOk7DaVMwC52NZxnc5vcayaMCJjzcI5jbiJZ7WfJbPPT4Q7qZwKNv9n3s1K2Jz1a Cs7L99rl8JFcK0ov3aDEiqQKcQQjcmyVTYqdntOTE9yKKZkR+QkJmgoHegdkaj0VMuMy M/xA== Return-Path: Received: from bubble.grove.modra.org ([2406:3400:51d:8cc0:f01a:fb53:d2a1:1c96]) by smtp.gmail.com with ESMTPSA id o6sm5675103pgg.37.2020.02.11.21.26.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 21:26:02 -0800 (PST) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id EAD998062F; Wed, 12 Feb 2020 15:55:58 +1030 (ACDT) Date: Wed, 12 Feb 2020 05:26:00 -0000 From: Alan Modra To: cgen@sourceware.org Subject: Update to autotools used by binutils Message-ID: <20200212052558.GA27162@bubble.grove.modra.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-SW-Source: 2020-q1/txt/msg00009.txt When cgen source is installed in the top source directory of binutils-gdb and configuring with --enable-maintainer-mode --enable-cgen-maint=yes it is somewhat difficult to regenerate cgen files without differences due to using different autotools. Particularly so since the generated files in the git repository don't all use the same autotools. This patch fixes that by modernising the source a little and regenerating with autoconf-2.69 and automake-1.15.1. Note that doc/stamp-vti and doc/version.texi contain dates taken from your checked out doc/cgen.texi file time stamp. So in order to regenerate these files consistently it is necessary to touch --date=xxx doc/cgen.texi with the date taken from the last doc/cgen.texi commit. With that done, only stamp-vti needs updating (to a copy of version.texi). OK to apply? * configure.ac: Renamed from configure.in. (AC_INIT, AM_INIT_AUTOMAKE): Modernize. (AC_CONFIG_SRCDIR): Invoke. * INSTALL: Adjust for configure.ac renaming. * Makefile.am (AUTOMAKE_OPTIONS): Delete cygnus and version. Add foreign. * testsuite/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * doc/Makefile.am (AUTOMAKE_OPTIONS): Delete cygnus, add foreign, info-in-builddir and no-texinfo.tex. (DISTCLEANFILES): Delete automake-1.9 hack. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. * doc/Makefile.in: Regenerate. * doc/stamp-vti: Regenerate. * testsuite/Makefile.in: Regenerate. diff --git a/INSTALL b/INSTALL index d2df4e1..606b41a 100644 --- a/INSTALL +++ b/INSTALL @@ -19,8 +19,8 @@ diffs or instructions to the address given in the `README' so they can be considered for the next release. If at some point `config.cache' contains results you don't want to keep, you may remove or edit it. - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change + The file `configure.ac' is used to create `configure' by a program +called `autoconf'. You only need `configure.ac' if you want to change it or regenerate `configure' using a newer version of `autoconf'. The simplest way to compile this package is: diff --git a/Makefile.am b/Makefile.am index d4d0984..c441e20 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,7 @@ # . # -AUTOMAKE_OPTIONS = 1.9 cygnus +AUTOMAKE_OPTIONS = foreign SUBDIRS = doc testsuite diff --git a/configure.in b/configure.ac similarity index 94% rename from configure.in rename to configure.ac index 06e16ca..d336fd2 100644 --- a/configure.in +++ b/configure.ac @@ -18,10 +18,11 @@ dnl . dnl AC_PREREQ(2.59) -AC_INIT(read.scm) -AC_CANONICAL_SYSTEM dnl The "50" is a generic indicator that we're between 1.1 and 1.2. -AM_INIT_AUTOMAKE(cgen, 1.1.50) +AC_INIT(cgen, 1.1.50) +AC_CONFIG_SRCDIR(read.scm) +AC_CANONICAL_SYSTEM +AM_INIT_AUTOMAKE AC_PROG_INSTALL AC_EXEEXT diff --git a/doc/Makefile.am b/doc/Makefile.am index 085224a..4f03021 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -17,7 +17,7 @@ # . # -AUTOMAKE_OPTIONS = cygnus +AUTOMAKE_OPTIONS = foreign info-in-builddir no-texinfo.tex # List of files that go into cgen.info. DOCFILES = app.texi cgen.texi credits.texi glossary.texi intro.texi \ @@ -39,11 +39,3 @@ noinst_TEXINFOS = cgen.texi cgenint.texi # Maintenance MAINTAINERCLEANFILES = cgen.info cgenint.info - -# Automake 1.9 will only build info files in the objdir if they are -# mentioned in DISTCLEANFILES. It doesn't have to be unconditional, -# though, so we use a bogus condition. -# NOTE: This is copied from gas. -if GENINSRC_NEVER -DISTCLEANFILES = cgen.info cgenint.info -endif diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 3eb1d96..9a5d404 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -18,7 +18,7 @@ # . # -AUTOMAKE_OPTIONS = 1.9 cygnus +AUTOMAKE_OPTIONS = foreign cgendir = $(srcdir)/.. -- Alan Modra Australia Development Lab, IBM