diff options
| author | Diego Elio Pettenò <flameeyes@flameeyes.eu> | 2012-07-04 15:57:04 -0700 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2012-07-08 16:51:35 +0200 |
| commit | 432e5a6c2f5e453b7dcafecb7c9ff816029345a6 (patch) | |
| tree | 52c4cde49e28780be47bf852ef9f45f6a459fe0b | |
| parent | 201a024b67c44477225a94c6e0ce99df5c8c8134 (diff) | |
build: update autotools to modern standards.
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ò <flameeyes@flameeyes.eu>
| -rw-r--r-- | AUTHORS | 0 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | NEWS | 0 | ||||
| -rw-r--r-- | configure.ac (renamed from configure.in) | 5 |
4 files changed, 3 insertions, 9 deletions
diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index e69de29..0000000 --- a/AUTHORS +++ /dev/null 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/configure.in b/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 |