Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: f7bd1e8)
remove tertiary include paths
authorZachary T Welch <zw@superlucidity.net>
Sun, 29 Nov 2009 00:27:10 +0000 (16:27 -0800)
committerZachary T Welch <zw@superlucidity.net>
Thu, 3 Dec 2009 12:24:50 +0000 (04:24 -0800)
With all #include directives converted, we only need to have the
top-level src/ directory in the search path.

12 files changed:
src/Makefile.am patch | blob | history
src/flash/Makefile.am patch | blob | history
src/flash/nand/Makefile.am patch | blob | history
src/flash/nor/Makefile.am patch | blob | history
src/helper/Makefile.am patch | blob | history
src/jtag/Makefile.am patch | blob | history
src/jtag/drivers/Makefile.am patch | blob | history
src/pld/Makefile.am patch | blob | history
src/server/Makefile.am patch | blob | history
src/svf/Makefile.am patch | blob | history
src/target/Makefile.am patch | blob | history
src/xsvf/Makefile.am patch | blob | history

diff --git a/src/Makefile.am b/src/Makefile.am
index 203375209206002baf33d9829bd2af2109897aec..e6462c1f11fb206a5c25ed2ac9ad60194c279de1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,15 +24,7 @@ noinst_HEADERS = \
 
 # set the include path found by configure
 AM_CPPFLAGS = \
 
 # 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`\"
 
 
 libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
 
diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index ee322eeeeba922aacbdc58d6a8fc938cf82b93b0..cda59e44e1f98ac388eda23d419ae7e32f86e953 100644 (file)
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -3,10 +3,7 @@ SUBDIRS = \
        nand
 
 AM_CPPFLAGS = \
        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
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libflash.la
diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am
index 921b7f3d2f4f6e5f53bd309b579415f06bffacd6..34947b6e2534509526c4b037026d4c9e8c6bcdce 100644 (file)
--- 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
 
 
 noinst_LTLIBRARIES = libocdflashnand.la
 
diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am
index 1be84becfa3508f33eb49e53867862f6d779cdd9..211366b812d3a44f744701a457af9ad4cd2b8473 100644 (file)
--- 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 = \
 
 noinst_LTLIBRARIES = libocdflashnor.la
 libocdflashnor_la_SOURCES = \
diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index bf8527f8b9e72072e3802a26f1e84ec69be1f207..4f74b9aedcd0709a8cbb42c255bb20a23723fb9c 100644 (file)
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,7 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/server \
-       -I$(top_srcdir)/src/target \
        -DPKGDATADIR=\"$(pkgdatadir)\"
 
 METASOURCES = AUTO
        -DPKGDATADIR=\"$(pkgdatadir)\"
 
 METASOURCES = AUTO
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 4ca0c782bbf30c7734504a3a94f039532810cfe4..39b4b59a9f40a813006df77aca0f8e913babc45c 100644 (file)
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -1,7 +1,5 @@
 AM_CPPFLAGS = \
 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
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libjtag.la
diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index 4e2bce049fcd91f7112edc9c63feef7de1327af0..92a96f3339e00b20e0a4e200e3aecc5283d84a61 100644 (file)
--- 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
 
 
 noinst_LTLIBRARIES = libocdjtagdrivers.la
 
diff --git a/src/pld/Makefile.am b/src/pld/Makefile.am
index d99a89cdce662df6f6058eb5108f62c06812f2fe..fa40e56ea9c9fe5ffc170b1ada8289faaa719f0f 100644 (file)
--- a/src/pld/Makefile.am
+++ b/src/pld/Makefile.am
@@ -1,8 +1,5 @@
 AM_CPPFLAGS = \
 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
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libpld.la
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 989a682ce3147cb68e15a6ea58724e12a2a1f770..de83a06aa8ce609c2bb8fe302483fd7fa0c7c434 100644 (file)
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,9 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
 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
        -DPKGDATADIR=\"$(pkgdatadir)\"
 
 METASOURCES = AUTO
diff --git a/src/svf/Makefile.am b/src/svf/Makefile.am
index 10cb967167bdeb5864f1dfd993fc4d8b3a8ba902..adc415fa7e4ac7302f6a16d423180bd722bc5d0c 100644 (file)
--- a/src/svf/Makefile.am
+++ b/src/svf/Makefile.am
@@ -1,8 +1,5 @@
 AM_CPPFLAGS = \
 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
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libsvf.la
diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index cd9035513324d44d5a5b5b34b26c39e93783c2fc..7631beaadd19928ea63c82532d16f05a8ae8c0b1 100644 (file)
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -6,10 +6,7 @@ OOCD_TRACE_FILES =
 endif
 
 AM_CPPFLAGS = \
 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)
 
 
 BIN2C          = $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD)
 
diff --git a/src/xsvf/Makefile.am b/src/xsvf/Makefile.am
index 5a58e26926c297cc3bd8605390c67404c9599d06..3e2a04eeb07cfbb903dcfe2918691f9309032e86 100644 (file)
--- a/src/xsvf/Makefile.am
+++ b/src/xsvf/Makefile.am
@@ -1,9 +1,5 @@
 AM_CPPFLAGS = \
 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
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libxsvf.la
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)