I would say that the builddir should precede the srcdir. Happily, this
should also generate a more minimal patch.
Patches should touch as few lines as possible. Make all of them match
the form:
FOO = \
foo \
bar
not
FOO = foo \
bar
The first form makes it possible to insert above or below with a
one-line patch. The second requires removing and adding two, which is
what you have done. While I know this may seem like asking for a lot,
this minimization process makes it much easier to review the patches, as
you are making less superfluous changes. Here, I think almost 2/3 of
the touched lines probably could be eliminated.
On Tue, 2009-12-08 at 09:39 +0100, Øyvind Harboe wrote:
> This allows including generated include files.
>
> Signed-off-by: Øyvind Harboe <[email protected]>
> ---
> src/Makefile.am | 3 ++-
> src/flash/Makefile.am | 3 ++-
> src/flash/nand/Makefile.am | 3 ++-
> src/flash/nor/Makefile.am | 3 ++-
> src/helper/Makefile.am | 1 +
> src/jtag/Makefile.am | 3 ++-
> src/jtag/drivers/Makefile.am | 3 ++-
> src/pld/Makefile.am | 3 ++-
> src/server/Makefile.am | 1 +
> src/svf/Makefile.am | 3 ++-
> src/target/Makefile.am | 3 ++-
> src/xsvf/Makefile.am | 3 ++-
> 12 files changed, 22 insertions(+), 10 deletions(-)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index ea753bb..f60feac 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -32,7 +32,8 @@ noinst_HEADERS = \
>
> # set the include path found by configure
> AM_CPPFLAGS = \
> - -I$(top_srcdir)/src
> + -I$(top_srcdir)/src \
> + -I$(top_builddir)/src
>
> libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
>
> diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
> index 646889e..9d983a8 100644
> --- a/src/flash/Makefile.am
> +++ b/src/flash/Makefile.am
> @@ -3,7 +3,8 @@ SUBDIRS = \
> nand
>
> AM_CPPFLAGS = \
> - -I$(top_srcdir)/src
> + -I$(top_srcdir)/src \
> + -I$(top_builddir)/src
>
> METASOURCES = AUTO
> noinst_LTLIBRARIES = libflash.la
> diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am
> index a48b726..1cf0df8 100644
> --- a/src/flash/nand/Makefile.am
> +++ b/src/flash/nand/Makefile.am
> @@ -1,4 +1,5 @@
> -AM_CPPFLAGS = -I$(top_srcdir)/src
> +AM_CPPFLAGS = -I$(top_srcdir)/src \
> + -I$(top_builddir)/src
>
> noinst_LTLIBRARIES = libocdflashnand.la
>
> diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am
> index f185081..867623c 100644
> --- a/src/flash/nor/Makefile.am
> +++ b/src/flash/nor/Makefile.am
> @@ -1,4 +1,5 @@
> -AM_CPPFLAGS = -I$(top_srcdir)/src
> +AM_CPPFLAGS = -I$(top_srcdir)/src \
> + -I$(top_builddir)/src
>
> noinst_LTLIBRARIES = libocdflashnor.la
> libocdflashnor_la_SOURCES = \
> diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
> index 4f74b9a..244ada7 100644
> --- a/src/helper/Makefile.am
> +++ b/src/helper/Makefile.am
> @@ -1,5 +1,6 @@
> AM_CPPFLAGS = \
> -I$(top_srcdir)/src \
> + -I$(top_builddir)/src \
> -DPKGDATADIR=\"$(pkgdatadir)\"
>
> METASOURCES = AUTO
> diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
> index 39b4b59..da2eddd 100644
> --- a/src/jtag/Makefile.am
> +++ b/src/jtag/Makefile.am
> @@ -1,5 +1,6 @@
> AM_CPPFLAGS = \
> - -I$(top_srcdir)/src
> + -I$(top_srcdir)/src \
> + -I$(top_builddir)/src
>
> METASOURCES = AUTO
> noinst_LTLIBRARIES = libjtag.la
> diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
> index 92a96f3..4aac86a 100644
> --- a/src/jtag/drivers/Makefile.am
> +++ b/src/jtag/drivers/Makefile.am
> @@ -1,4 +1,5 @@
> -AM_CPPFLAGS = -I$(top_srcdir)/src
> +AM_CPPFLAGS = -I$(top_srcdir)/src \
> + -I$(top_builddir)/src
>
> noinst_LTLIBRARIES = libocdjtagdrivers.la
>
> diff --git a/src/pld/Makefile.am b/src/pld/Makefile.am
> index fa40e56..3993622 100644
> --- a/src/pld/Makefile.am
> +++ b/src/pld/Makefile.am
> @@ -1,5 +1,6 @@
> AM_CPPFLAGS = \
> - -I$(top_srcdir)/src
> + -I$(top_srcdir)/src \
> + -I$(top_builddir)/src
>
> METASOURCES = AUTO
> noinst_LTLIBRARIES = libpld.la
> diff --git a/src/server/Makefile.am b/src/server/Makefile.am
> index de83a06..c6c946f 100644
> --- a/src/server/Makefile.am
> +++ b/src/server/Makefile.am
> @@ -1,5 +1,6 @@
> AM_CPPFLAGS = \
> -I$(top_srcdir)/src \
> + -I$(top_builddir)/src \
> -DPKGDATADIR=\"$(pkgdatadir)\"
>
> METASOURCES = AUTO
> diff --git a/src/svf/Makefile.am b/src/svf/Makefile.am
> index adc415f..398f967 100644
> --- a/src/svf/Makefile.am
> +++ b/src/svf/Makefile.am
> @@ -1,5 +1,6 @@
> AM_CPPFLAGS = \
> - -I$(top_srcdir)/src
> + -I$(top_srcdir)/src \
> + -I$(top_builddir)/src
>
> METASOURCES = AUTO
> noinst_LTLIBRARIES = libsvf.la
> diff --git a/src/target/Makefile.am b/src/target/Makefile.am
> index f1d5d15..f1d4caa 100644
> --- a/src/target/Makefile.am
> +++ b/src/target/Makefile.am
> @@ -6,7 +6,8 @@ OOCD_TRACE_FILES =
> endif
>
> AM_CPPFLAGS = \
> - -I$(top_srcdir)/src
> + -I$(top_srcdir)/src \
> + -I$(top_builddir)/src
>
> BIN2C = $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD)
>
> diff --git a/src/xsvf/Makefile.am b/src/xsvf/Makefile.am
> index 3e2a04e..f96331c 100644
> --- a/src/xsvf/Makefile.am
> +++ b/src/xsvf/Makefile.am
> @@ -1,5 +1,6 @@
> AM_CPPFLAGS = \
> - -I$(top_srcdir)/src
> + -I$(top_srcdir)/src \
> + -I$(top_builddir)/src
>
> METASOURCES = AUTO
> noinst_LTLIBRARIES = libxsvf.la
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
