From eb1bc657ae10f9e21304e068ca17dc0231a9b9c0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Harboe?= Date: Sat, 5 Dec 2009 10:50:59 +0100 Subject: [PATCH] build: add build/src to include path MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This allows including generated include files. Signed-off-by: Øyvind Harboe --- src/Makefile.am | 3 ++- src/flash/Makefile.am | 3 ++- src/flash/nand/Makefile.am | 4 +++- src/flash/nor/Makefile.am | 4 +++- src/helper/Makefile.am | 1 + src/jtag/Makefile.am | 3 ++- src/jtag/drivers/Makefile.am | 4 +++- src/pld/Makefile.am | 3 ++- src/server/Makefile.am | 1 + src/svf/Makefile.am | 3 ++- src/target/Makefile.am | 3 ++- src/xsvf/Makefile.am | 3 ++- 12 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ea753bbff2..f60feac313 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 646889e1de..9d983a8d9e 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 a48b726ac7..f3033b8550 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 f185081213..5d0a4dfcb1 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 4f74b9aedc..244ada7cd8 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 39b4b59a9f..da2edddcbe 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 92a96f3339..8ee5ac592b 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 fa40e56ea9..3993622e6c 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 de83a06aa8..c6c946f0b0 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 adc415fa7e..398f9676d6 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 f1d5d15c67..f1d4caa2fd 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 3e2a04eeb0..f96331cd56 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 -- 2.30.2