From: Øyvind Harboe Date: Sat, 5 Dec 2009 09:50:59 +0000 (+0100) Subject: build: add build/src to include path X-Git-Tag: v0.4.0-rc1~76 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eb1bc657ae10f9e21304e068ca17dc0231a9b9c0;p=openocd build: add build/src to include path This allows including generated include files. Signed-off-by: Øyvind Harboe --- diff --git a/src/Makefile.am b/src/Makefile.am index ea753bbf..f60feac3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,7 +32,8 @@ noinst_HEADERS = \ # set the include path found by configure AM_CPPFLAGS = \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + -I$(top_builddir)/src libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\" diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am index 646889e1..9d983a8d 100644 --- a/src/flash/Makefile.am +++ b/src/flash/Makefile.am @@ -3,7 +3,8 @@ SUBDIRS = \ nand AM_CPPFLAGS = \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + -I$(top_builddir)/src METASOURCES = AUTO noinst_LTLIBRARIES = libflash.la diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am index a48b726a..f3033b85 100644 --- a/src/flash/nand/Makefile.am +++ b/src/flash/nand/Makefile.am @@ -1,4 +1,6 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src +AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src noinst_LTLIBRARIES = libocdflashnand.la diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am index f1850812..5d0a4dfc 100644 --- a/src/flash/nor/Makefile.am +++ b/src/flash/nor/Makefile.am @@ -1,4 +1,6 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src +AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src noinst_LTLIBRARIES = libocdflashnor.la libocdflashnor_la_SOURCES = \ diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am index 4f74b9ae..244ada7c 100644 --- a/src/helper/Makefile.am +++ b/src/helper/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ -DPKGDATADIR=\"$(pkgdatadir)\" METASOURCES = AUTO diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am index 39b4b59a..da2edddc 100644 --- a/src/jtag/Makefile.am +++ b/src/jtag/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + -I$(top_builddir)/src METASOURCES = AUTO noinst_LTLIBRARIES = libjtag.la diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index 92a96f33..8ee5ac59 100644 --- a/src/jtag/drivers/Makefile.am +++ b/src/jtag/drivers/Makefile.am @@ -1,4 +1,6 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src +AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src noinst_LTLIBRARIES = libocdjtagdrivers.la diff --git a/src/pld/Makefile.am b/src/pld/Makefile.am index fa40e56e..3993622e 100644 --- a/src/pld/Makefile.am +++ b/src/pld/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + -I$(top_builddir)/src METASOURCES = AUTO noinst_LTLIBRARIES = libpld.la diff --git a/src/server/Makefile.am b/src/server/Makefile.am index de83a06a..c6c946f0 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ -DPKGDATADIR=\"$(pkgdatadir)\" METASOURCES = AUTO diff --git a/src/svf/Makefile.am b/src/svf/Makefile.am index adc415fa..398f9676 100644 --- a/src/svf/Makefile.am +++ b/src/svf/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + -I$(top_builddir)/src METASOURCES = AUTO noinst_LTLIBRARIES = libsvf.la diff --git a/src/target/Makefile.am b/src/target/Makefile.am index f1d5d15c..f1d4caa2 100644 --- a/src/target/Makefile.am +++ b/src/target/Makefile.am @@ -6,7 +6,8 @@ OOCD_TRACE_FILES = endif AM_CPPFLAGS = \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + -I$(top_builddir)/src BIN2C = $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD) diff --git a/src/xsvf/Makefile.am b/src/xsvf/Makefile.am index 3e2a04ee..f96331cd 100644 --- a/src/xsvf/Makefile.am +++ b/src/xsvf/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + -I$(top_builddir)/src METASOURCES = AUTO noinst_LTLIBRARIES = libxsvf.la