diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 15 | ||||
| -rw-r--r-- | src/flash/Makefile.am | 7 | ||||
| -rw-r--r-- | src/helper/Makefile.am | 8 | ||||
| -rw-r--r-- | src/jtag/Makefile.am | 5 | ||||
| -rw-r--r-- | src/pld/Makefile.am | 6 | ||||
| -rw-r--r-- | src/server/Makefile.am | 9 | ||||
| -rw-r--r-- | src/svf/Makefile.am | 6 | ||||
| -rw-r--r-- | src/target/Makefile.am | 7 | ||||
| -rw-r--r-- | src/xsvf/Makefile.am | 6 |
9 files changed, 52 insertions, 17 deletions
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 |