From 822c06d9e3983b37cd1830c594210973cb560991 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Sat, 28 Nov 2009 16:27:10 -0800 Subject: [PATCH] remove tertiary include paths With all #include directives converted, we only need to have the top-level src/ directory in the search path. --- src/Makefile.am | 10 +--------- src/flash/Makefile.am | 5 +---- src/flash/nand/Makefile.am | 7 +------ src/flash/nor/Makefile.am | 7 +------ src/helper/Makefile.am | 2 -- src/jtag/Makefile.am | 4 +--- src/jtag/drivers/Makefile.am | 5 +---- src/pld/Makefile.am | 5 +---- src/server/Makefile.am | 4 ---- src/svf/Makefile.am | 5 +---- src/target/Makefile.am | 5 +---- src/xsvf/Makefile.am | 6 +----- 12 files changed, 10 insertions(+), 55 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 2033752092..e6462c1f11 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 ee322eeeeb..cda59e44e1 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 921b7f3d2f..34947b6e25 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 1be84becfa..211366b812 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 bf8527f8b9..4f74b9aedc 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 4ca0c782bb..39b4b59a9f 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 4e2bce049f..92a96f3339 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 d99a89cdce..fa40e56ea9 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 989a682ce3..de83a06aa8 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 10cb967167..adc415fa7e 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 cd90355133..7631beaadd 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 5a58e26926..3e2a04eeb0 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 -- 2.30.2