From 432e5a6c2f5e453b7dcafecb7c9ff816029345a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 4 Jul 2012 15:57:04 -0700 Subject: [PATCH] build: update autotools to modern standards. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This includes removing AC_CANONICAL_BUILD/AC_CANONICAL_TARGET (weren't used), renaming configure.in to configure.ac (required for automake 1.13 coming up), moving automake options to configure.ac (removes use of AM_INIT_AUTOMAKE with two parameters, which is also gone with automake 1.13). Also remove empty files and declare the system foreign, not gnu (NEWS and AUTHORS are not used), avoid re-declaring in the distributed files the conditional sources (automake takes care of that), and don't use -Werror (as it would fail to build with GCC 4.6 and 4.7). Signed-off-by: Diego Elio Pettenò --- AUTHORS | 0 Makefile.am | 7 ++----- NEWS | 0 configure.in => configure.ac | 5 +---- 4 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 AUTHORS delete mode 100644 NEWS rename configure.in => configure.ac (93%) diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile.am b/Makefile.am index ae59bd6..7d6aaf8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,4 @@ -AM_CFLAGS = -Wall -Werror - -AUTOMAKE_OPTIONS = gnu +AM_CFLAGS = -Wall bin_PROGRAMS = sam7 @@ -22,6 +20,5 @@ endif noinst_HEADERS = io.h samba.h cmd.h loader128_data.h loader256_data.h EXTRA_DIST = driver/Makefile driver/at91.c \ - io_win32.c io_posix.c io_iokit.c io_libusb.c\ loader/Makefile loader/at91.h loader/bin2c.c loader/crt0.S \ - loader/loader.c loader/loader.lds \ No newline at end of file + loader/loader.c loader/loader.lds diff --git a/NEWS b/NEWS deleted file mode 100644 index e69de29..0000000 diff --git a/configure.in b/configure.ac similarity index 93% rename from configure.in rename to configure.ac index 4a5a8b3..e16b1ed 100644 --- a/configure.in +++ b/configure.ac @@ -1,13 +1,10 @@ AC_INIT([sam7utils], [0.2.1], [konkers@konkers.net]) -AC_CANONICAL_BUILD AC_CANONICAL_HOST -AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(sam7utils,0.2.1) +AM_INIT_AUTOMAKE(foreign) AM_CONFIG_HEADER(config.h) - AC_PROG_CC AC_PROG_INSTALL AC_PROG_MAKE_SET