From 66add57aa5bae147b7996840a2287f3547b4b8ea Mon Sep 17 00:00:00 2001 From: zwelch Date: Sat, 2 May 2009 22:35:02 +0000 Subject: [PATCH] Update autotools scripts to require automake 1.6. The configure.in script already required autoconf 2.59 (circa 2006), so there is no reason to support versions of automake older than 1.6 (circa 2002). The first part of this patch upgrades the configure.in script: 1. Use current calling conventions for the AC_INIT and AM_INIT_AUTOMAKE macros, bringing their usage up-to-date with the version of autoconf already specified by AC_PREREQ. 2. Add AC_CONFIG_SRCDIR macro, required by new version of AC_INIT. 3. Automatically enable all of automake's warnings except Makefile portability (which OpenOCD violates by using GNU make's $(wildcard)). [[ While automake has its own -Werror option, I did not enabled it due to existing warnings. ]] 4. Add the missing AM_PROG_C_O check, required by the build rules for openocd.o in src/Makefile.am. 5. Adjust version number to show progress toward the next release. 6. Include a bug reporting e-mail address to direct users to this list. This patch makes the following adjustments to the Makefile.am files: 1. Update AUTOMAKE_OPTIONS to require automake version 1.6 2. Rewrite all deprecated INCLUDES assignments as AM_CPPFLAGS 3. Clean-up all AM_CPPFLAGS declarations to be patch-friendly. 4. Remove vestigial references to $(all_includes) 5. Remove erroneous references to @CPPFLAGS@ (only use AM_CPPFLAGS) 6. Remove unused -I and -D directives in helper/, flash/, target/ git-svn-id: svn://svn.berlios.de/openocd/trunk@1591 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- Makefile.am | 4 +++- configure.in | 7 +++++-- src/Makefile.am | 15 +++++++++++---- src/flash/Makefile.am | 7 +++++-- src/helper/Makefile.am | 8 ++++++-- src/jtag/Makefile.am | 5 +++-- src/pld/Makefile.am | 6 +++++- src/server/Makefile.am | 9 +++++++-- src/svf/Makefile.am | 6 +++++- src/target/Makefile.am | 7 +++++-- src/xsvf/Makefile.am | 6 +++++- 11 files changed, 60 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index ef17876d..c01c48f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.6 nobase_dist_pkgdata_DATA = \ contrib/libdcc/dcc_stdio.c \ @@ -18,6 +18,8 @@ MAINTAINERCLEANFILES = \ config.guess \ config.sub \ config.h.in \ + config.h.in~ \ + compile \ missing \ aclocal.m4 \ install-sh diff --git a/configure.in b/configure.in index 9eaeb7e4..9855da09 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,7 @@ AC_PREREQ(2.59) -AC_INIT(configure.in) +AC_INIT([openocd], [0.2.0-in-development], + [OpenOCD Mailing List ]) +AC_CONFIG_SRCDIR([src/openocd.c]) AC_CANONICAL_HOST @@ -738,7 +740,7 @@ CFLAGS=$CFLAGS_SAVE fi AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(openocd, 1.0) +AM_INIT_AUTOMAKE([-Wall -Wno-portability]) AM_MAINTAINER_MODE AM_CONDITIONAL(RELEASE, test $build_release = yes) @@ -771,6 +773,7 @@ AM_CONDITIONAL(BITQ, test $build_bitq = yes) AC_LANG_C AC_PROG_CC +AM_PROG_CC_C_O AC_PROG_RANLIB # set default gcc warnings diff --git a/src/Makefile.am b/src/Makefile.am index a4995794..3cbfd3e4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,9 +9,16 @@ endif openocd_SOURCES = $(MAINFILE) openocd.c # set the include path found by configure -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper \ - -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target -I$(top_srcdir)/src/xsvf -I$(top_srcdir)/src/svf \ - -I$(top_srcdir)/src/server -I$(top_srcdir)/src/flash -I$(top_srcdir)/src/pld $(all_includes) +AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/helper \ + -I$(top_srcdir)/src/jtag \ + -I$(top_srcdir)/src/target \ + -I$(top_srcdir)/src/xsvf \ + -I$(top_srcdir)/src/svf \ + -I$(top_srcdir)/src/server \ + -I$(top_srcdir)/src/flash \ + -I$(top_srcdir)/src/pld # pass path to prefix path openocd_CPPFLAGS = \ @@ -25,7 +32,7 @@ openocd_CPPFLAGS += -DRELSTR=\"svn:\" -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh endif # add default CPPFLAGS -openocd_CPPFLAGS += @CPPFLAGS@ +openocd_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS) # the library search path. openocd_LDFLAGS = $(all_libraries) diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am index b384c553..ab208b41 100644 --- a/src/flash/Makefile.am +++ b/src/flash/Makefile.am @@ -1,5 +1,8 @@ -INCLUDES = -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target $(all_includes) -AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@ +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/helper \ + -I$(top_srcdir)/src/jtag \ + -I$(top_srcdir)/src/target + METASOURCES = AUTO noinst_LIBRARIES = libflash.a libflash_a_SOURCES = \ diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am index e8d9a694..e0686401 100644 --- a/src/helper/Makefile.am +++ b/src/helper/Makefile.am @@ -1,6 +1,10 @@ -INCLUDES = -I$(top_srcdir)/src $(all_includes) -I$(top_srcdir)/src/target -I$(top_srcdir)/src/server +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/server \ + -I$(top_srcdir)/src/target \ + -DPKGDATADIR=\"$(pkgdatadir)\" \ + -DPKGLIBDIR=\"$(pkglibdir)\" + METASOURCES = AUTO -AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@ noinst_LIBRARIES = libhelper.a if ECOSBOARD diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am index 717c435d..45883121 100644 --- a/src/jtag/Makefile.am +++ b/src/jtag/Makefile.am @@ -1,6 +1,7 @@ +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/helper \ + -I$(top_srcdir)/src/target - -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper $(all_includes) -I$(top_srcdir)/src/target METASOURCES = AUTO noinst_LIBRARIES = libjtag.a diff --git a/src/pld/Makefile.am b/src/pld/Makefile.am index a6584e80..7fab855e 100644 --- a/src/pld/Makefile.am +++ b/src/pld/Makefile.am @@ -1,4 +1,8 @@ -INCLUDES = -I$(top_srcdir)/src/server -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag $(all_includes) +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/server \ + -I$(top_srcdir)/src/helper \ + -I$(top_srcdir)/src/jtag + METASOURCES = AUTO noinst_LIBRARIES = libpld.a noinst_HEADERS = pld.h xilinx_bit.h virtex2.h diff --git a/src/server/Makefile.am b/src/server/Makefile.am index faf49606..34957a6d 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -1,4 +1,10 @@ -INCLUDES = -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/target -I$(top_srcdir)/src/flash -I$(top_srcdir)/src/jtag $(all_includes) +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/helper \ + -I$(top_srcdir)/src/target \ + -I$(top_srcdir)/src/flash \ + -I$(top_srcdir)/src/jtag \ + -DPKGLIBDIR=\"$(pkglibdir)\" + METASOURCES = AUTO noinst_LIBRARIES = libserver.a noinst_HEADERS = server.h telnet_server.h gdb_server.h @@ -21,6 +27,5 @@ libserver_a_SOURCES += tcl_server.c if HTTPD nobase_dist_pkglib_DATA = $(wildcard $(srcdir)/httpd/*.tcl $(srcdir)/httpd/*.css $(srcdir)/httpd/menu_cuts/*.png) endif -AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@ MAINTAINERCLEANFILES = Makefile.in diff --git a/src/svf/Makefile.am b/src/svf/Makefile.am index 47ab0f2e..73edd43f 100644 --- a/src/svf/Makefile.am +++ b/src/svf/Makefile.am @@ -1,4 +1,8 @@ -INCLUDES = -I$(top_srcdir)/src/server -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag $(all_includes) +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/server \ + -I$(top_srcdir)/src/helper \ + -I$(top_srcdir)/src/jtag + METASOURCES = AUTO noinst_LIBRARIES = libsvf.a noinst_HEADERS = svf.h diff --git a/src/target/Makefile.am b/src/target/Makefile.am index fb0ce3b0..db776477 100644 --- a/src/target/Makefile.am +++ b/src/target/Makefile.am @@ -5,9 +5,12 @@ else OOCD_TRACE_FILES = endif -INCLUDES = -I$(top_srcdir)/src/gdb -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/xsvf $(all_includes) +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/helper \ + -I$(top_srcdir)/src/jtag \ + -I$(top_srcdir)/src/xsvf + METASOURCES = AUTO -AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@ noinst_LIBRARIES = libtarget.a libtarget_a_SOURCES = target.c register.c breakpoints.c armv4_5.c embeddedice.c etm.c arm7tdmi.c arm9tdmi.c \ arm_jtag.c arm7_9_common.c algorithm.c arm920t.c arm720t.c armv4_5_mmu.c armv4_5_cache.c arm_disassembler.c \ diff --git a/src/xsvf/Makefile.am b/src/xsvf/Makefile.am index 3ad3ca39..3553a7af 100644 --- a/src/xsvf/Makefile.am +++ b/src/xsvf/Makefile.am @@ -1,4 +1,8 @@ -INCLUDES = -I$(top_srcdir)/src/server -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag $(all_includes) +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/server \ + -I$(top_srcdir)/src/helper \ + -I$(top_srcdir)/src/jtag + METASOURCES = AUTO noinst_LIBRARIES = libxsvf.a noinst_HEADERS = xsvf.h -- 2.39.5