diff --git a/Makefile.am b/Makefile.am index ef17876d58cc5dccef6276c01aab4b6d5e67c2da..c01c48f6c07f1e4dd97a98ba338b1ee8c3fe1660 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 9eaeb7e4d6f6f782b2368a5b7487a5a44f06ba99..9855da0930b705fd8e3fe6af2125e2b0e9156e68 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 <openocd-development@lists.berlios.de>]) +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 a49957948e269f12eee4c65008e161de576a4509..3cbfd3e49e3c4ae3da1dc893deea4e7979782c6b 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 b384c553f23b96ea7c6b0aec69f73f8a4a751afa..ab208b41c9781e3617f500fbb5066d6ca7b94138 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 e8d9a6944887a3a7007c8bbd6b8448a07a9526a5..e0686401e58445e608aebc20a1bc303d75ed0abd 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 717c435dbea0e669e682ac11c06aef809f849fcf..45883121956a0c027c6b488d611aced1c7618a2e 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 a6584e80a56a557ead1abff144c4562af2f2d27e..7fab855e0d19ce2ea7d67cde2810856308ea06f4 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 faf496061c8f35d02ee1f9292edd99892915e062..34957a6d7b673865440f66fba8b304e94e96b7cd 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 47ab0f2e64a0084a77d2f30bcfdcb7a15d25d202..73edd43f33f5821a374ec95619da4df6ec8b9ed2 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 fb0ce3b04e5002a0626fef665700f7f97381a8b2..db77647728befc5e7a46897803efa144b71b2915 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 3ad3ca39b4c19457fa2e8cd18dab4213263b0cf3..3553a7af596b2548302b2d34d837c3bf91b10281 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