From 896ac8d4ef3212f80887bf009d626c5becb1240a Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Tue, 24 Nov 2009 14:59:16 -0800 Subject: [PATCH] allow #include directives to use module name Includes the src directory in the search path, so header files may be migrated from: #include "foo.h" to #include which is more conducive for installation. --- src/flash/Makefile.am | 1 + src/flash/nand/Makefile.am | 1 + src/flash/nor/Makefile.am | 1 + src/helper/Makefile.am | 1 + src/jtag/Makefile.am | 1 + src/jtag/drivers/Makefile.am | 1 + src/pld/Makefile.am | 1 + src/svf/Makefile.am | 1 + src/target/Makefile.am | 1 + src/xsvf/Makefile.am | 1 + 10 files changed, 10 insertions(+) diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am index 54a5116ee..ee322eeee 100644 --- a/src/flash/Makefile.am +++ b/src/flash/Makefile.am @@ -3,6 +3,7 @@ SUBDIRS = \ nand AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/helper \ -I$(top_srcdir)/src/jtag \ -I$(top_srcdir)/src/target diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am index e95717e2b..921b7f3d2 100644 --- a/src/flash/nand/Makefile.am +++ b/src/flash/nand/Makefile.am @@ -1,4 +1,5 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/flash \ -I$(top_srcdir)/src/helper \ -I$(top_srcdir)/src/jtag \ diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am index d2d99981d..1be84becf 100644 --- a/src/flash/nor/Makefile.am +++ b/src/flash/nor/Makefile.am @@ -1,4 +1,5 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/helper \ -I$(top_srcdir)/src/jtag \ -I$(top_srcdir)/src/flash \ diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am index 01e805eb0..bf8527f8b 100644 --- a/src/helper/Makefile.am +++ b/src/helper/Makefile.am @@ -1,4 +1,5 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/server \ -I$(top_srcdir)/src/target \ -DPKGDATADIR=\"$(pkgdatadir)\" diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am index 421987c4d..4ca0c782b 100644 --- a/src/jtag/Makefile.am +++ b/src/jtag/Makefile.am @@ -1,4 +1,5 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/helper \ -I$(top_srcdir)/src/target diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index 15fbae39e..4e2bce049 100644 --- a/src/jtag/drivers/Makefile.am +++ b/src/jtag/drivers/Makefile.am @@ -1,4 +1,5 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/helper \ -I$(top_srcdir)/src/jtag diff --git a/src/pld/Makefile.am b/src/pld/Makefile.am index 06d4fc4d6..d99a89cdc 100644 --- a/src/pld/Makefile.am +++ b/src/pld/Makefile.am @@ -1,4 +1,5 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/server \ -I$(top_srcdir)/src/helper \ -I$(top_srcdir)/src/jtag diff --git a/src/svf/Makefile.am b/src/svf/Makefile.am index 4dbd57fad..10cb96716 100644 --- a/src/svf/Makefile.am +++ b/src/svf/Makefile.am @@ -1,4 +1,5 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/server \ -I$(top_srcdir)/src/helper \ -I$(top_srcdir)/src/jtag diff --git a/src/target/Makefile.am b/src/target/Makefile.am index 6d2b76d91..cd9035513 100644 --- a/src/target/Makefile.am +++ b/src/target/Makefile.am @@ -6,6 +6,7 @@ OOCD_TRACE_FILES = endif AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/helper \ -I$(top_srcdir)/src/jtag \ -I$(top_srcdir)/src/xsvf diff --git a/src/xsvf/Makefile.am b/src/xsvf/Makefile.am index fd9f8c3f7..5a58e2692 100644 --- a/src/xsvf/Makefile.am +++ b/src/xsvf/Makefile.am @@ -1,4 +1,5 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/server \ -I$(top_srcdir)/src/helper \ -I$(top_srcdir)/src/svf \