summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-11-28 16:27:10 -0800
committerZachary T Welch <zw@superlucidity.net>2009-12-03 04:24:50 -0800
commit822c06d9e3983b37cd1830c594210973cb560991 (patch)
tree7f9e23295be85d3626a450fdc5e03e018a860b3a /src
parentf7bd1e8f3a302378687ded559e865c258d441c89 (diff)
downloadopenocd+libswd-822c06d9e3983b37cd1830c594210973cb560991.tar.gz
openocd+libswd-822c06d9e3983b37cd1830c594210973cb560991.tar.bz2
openocd+libswd-822c06d9e3983b37cd1830c594210973cb560991.tar.xz
openocd+libswd-822c06d9e3983b37cd1830c594210973cb560991.zip
remove tertiary include paths
With all #include directives converted, we only need to have the top-level src/ directory in the search path.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am10
-rw-r--r--src/flash/Makefile.am5
-rw-r--r--src/flash/nand/Makefile.am7
-rw-r--r--src/flash/nor/Makefile.am7
-rw-r--r--src/helper/Makefile.am2
-rw-r--r--src/jtag/Makefile.am4
-rw-r--r--src/jtag/drivers/Makefile.am5
-rw-r--r--src/pld/Makefile.am5
-rw-r--r--src/server/Makefile.am4
-rw-r--r--src/svf/Makefile.am5
-rw-r--r--src/target/Makefile.am5
-rw-r--r--src/xsvf/Makefile.am6
12 files changed, 10 insertions, 55 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 20337520..e6462c1f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,15 +24,7 @@ noinst_HEADERS = \
# set the include path found by configure
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
+ -I$(top_srcdir)/src
libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index ee322eee..cda59e44 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -3,10 +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
+ -I$(top_srcdir)/src
METASOURCES = AUTO
noinst_LTLIBRARIES = libflash.la
diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am
index 921b7f3d..34947b6e 100644
--- a/src/flash/nand/Makefile.am
+++ b/src/flash/nand/Makefile.am
@@ -1,9 +1,4 @@
-AM_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/flash \
- -I$(top_srcdir)/src/helper \
- -I$(top_srcdir)/src/jtag \
- -I$(top_srcdir)/src/target
+AM_CPPFLAGS = -I$(top_srcdir)/src
noinst_LTLIBRARIES = libocdflashnand.la
diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am
index 1be84bec..211366b8 100644
--- a/src/flash/nor/Makefile.am
+++ b/src/flash/nor/Makefile.am
@@ -1,9 +1,4 @@
-AM_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/helper \
- -I$(top_srcdir)/src/jtag \
- -I$(top_srcdir)/src/flash \
- -I$(top_srcdir)/src/target
+AM_CPPFLAGS = -I$(top_srcdir)/src
noinst_LTLIBRARIES = libocdflashnor.la
libocdflashnor_la_SOURCES = \
diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index bf8527f8..4f74b9ae 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,7 +1,5 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
- -I$(top_srcdir)/src/server \
- -I$(top_srcdir)/src/target \
-DPKGDATADIR=\"$(pkgdatadir)\"
METASOURCES = AUTO
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 4ca0c782..39b4b59a 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -1,7 +1,5 @@
AM_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/helper \
- -I$(top_srcdir)/src/target
+ -I$(top_srcdir)/src
METASOURCES = AUTO
noinst_LTLIBRARIES = libjtag.la
diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index 4e2bce04..92a96f33 100644
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -1,7 +1,4 @@
-AM_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/helper \
- -I$(top_srcdir)/src/jtag
+AM_CPPFLAGS = -I$(top_srcdir)/src
noinst_LTLIBRARIES = libocdjtagdrivers.la
diff --git a/src/pld/Makefile.am b/src/pld/Makefile.am
index d99a89cd..fa40e56e 100644
--- a/src/pld/Makefile.am
+++ b/src/pld/Makefile.am
@@ -1,8 +1,5 @@
AM_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/server \
- -I$(top_srcdir)/src/helper \
- -I$(top_srcdir)/src/jtag
+ -I$(top_srcdir)/src
METASOURCES = AUTO
noinst_LTLIBRARIES = libpld.la
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 989a682c..de83a06a 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,9 +1,5 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
- -I$(top_srcdir)/src/helper \
- -I$(top_srcdir)/src/target \
- -I$(top_srcdir)/src/flash \
- -I$(top_srcdir)/src/jtag \
-DPKGDATADIR=\"$(pkgdatadir)\"
METASOURCES = AUTO
diff --git a/src/svf/Makefile.am b/src/svf/Makefile.am
index 10cb9671..adc415fa 100644
--- a/src/svf/Makefile.am
+++ b/src/svf/Makefile.am
@@ -1,8 +1,5 @@
AM_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/server \
- -I$(top_srcdir)/src/helper \
- -I$(top_srcdir)/src/jtag
+ -I$(top_srcdir)/src
METASOURCES = AUTO
noinst_LTLIBRARIES = libsvf.la
diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index cd903551..7631beaa 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -6,10 +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
+ -I$(top_srcdir)/src
BIN2C = $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD)
diff --git a/src/xsvf/Makefile.am b/src/xsvf/Makefile.am
index 5a58e269..3e2a04ee 100644
--- a/src/xsvf/Makefile.am
+++ b/src/xsvf/Makefile.am
@@ -1,9 +1,5 @@
AM_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/server \
- -I$(top_srcdir)/src/helper \
- -I$(top_srcdir)/src/svf \
- -I$(top_srcdir)/src/jtag
+ -I$(top_srcdir)/src
METASOURCES = AUTO
noinst_LTLIBRARIES = libxsvf.la