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 <module/foo.h>

which is more conducive for installation.

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 54a5116ee8f8991b6a4a4fef6d096a58b8d2a200..ee322eeeeba922aacbdc58d6a8fc938cf82b93b0 100644 (file)
--- 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 e95717e2b80f274b964c7459170ddbeee4feee60..921b7f3d2f4f6e5f53bd309b579415f06bffacd6 100644 (file)
--- 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 d2d99981d85f0ebcdec32fdc4cfe0ea10bd74b9c..1be84becfa3508f33eb49e53867862f6d779cdd9 100644 (file)
--- 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 01e805eb05a21e1950653d32daa0cb517a4903ad..bf8527f8b9e72072e3802a26f1e84ec69be1f207 100644 (file)
--- 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 421987c4d58596fc767beb0def872f07f347a763..4ca0c782bbf30c7734504a3a94f039532810cfe4 100644 (file)
--- 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 15fbae39ecfdfc38e28d845bc44830577ac9e543..4e2bce049fcd91f7112edc9c63feef7de1327af0 100644 (file)
--- 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 06d4fc4d63f3b2deddb63ba8b59286e2584f5d46..d99a89cdce662df6f6058eb5108f62c06812f2fe 100644 (file)
--- 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 4dbd57fad44f4839234674219c751d13733536bc..10cb967167bdeb5864f1dfd993fc4d8b3a8ba902 100644 (file)
--- 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 6d2b76d91190fb9c647aea22f1cf1d2ab902e7ff..cd9035513324d44d5a5b5b34b26c39e93783c2fc 100644 (file)
--- 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 fd9f8c3f7960c426c94c259f7e36b2c2e6329f8e..5a58e26926c297cc3bd8605390c67404c9599d06 100644 (file)
--- 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 \