build: add common.mk

Rather than specifying common makefile variables move
them all to a common.mk.

Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>

diff --git a/common.mk b/common.mk
new file mode 100644 (file)
index 0000000..d2273d7
--- /dev/null
+++ b/common.mk
@@ -0,0 +1,5 @@
+
+# common flags used in openocd build
+AM_CPPFLAGS = -I$(top_srcdir)/src \
+                         -I$(top_builddir)/src \
+                         -DPKGDATADIR=\"$(pkgdatadir)\"

diff --git a/src/Makefile.am b/src/Makefile.am
index 19a0ba96c3d8cb78d27481ceb4729dcb651a0d5e..c2d37c1010601cb18e300c0e365270e03a3f964d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/common.mk
+
 SUBDIRS = \
        jtag \
        helper \
@@ -29,12 +31,6 @@ noinst_HEADERS = \
        hello.h \
        openocd.h
 
-
-# set the include path found by configure
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_builddir)/src
-
 libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
 
 # banner output includes RELSTR appended to $VERSION from the configure script

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 9d983a8d9e10dd1f1afa6f57c8c94d10e8f9ebdd..ece4018370b088352cf69ebd50e7e63b91b50c10 100644 (file)
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,11 +1,9 @@
+include $(top_srcdir)/common.mk
+
 SUBDIRS = \
        nor \
        nand
 
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_builddir)/src
-
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libflash.la
 libflash_la_SOURCES = \

diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am
index 8ea7b362dd873d561728920b207bdac0f29edda7..9aa0e69f16746363513744f29cc0a39620d5a940 100644 (file)
--- a/src/flash/nand/Makefile.am
+++ b/src/flash/nand/Makefile.am
@@ -1,6 +1,4 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_builddir)/src
+include $(top_srcdir)/common.mk
 
 noinst_LTLIBRARIES = libocdflashnand.la
 

diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am
index 852c0a37971e8cab230707c451bcdc3988535e92..e281c22bf30b4b7e46309acea2169844290f87bd 100644 (file)
--- a/src/flash/nor/Makefile.am
+++ b/src/flash/nor/Makefile.am
@@ -1,6 +1,4 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_builddir)/src
+include $(top_srcdir)/common.mk
 
 noinst_LTLIBRARIES = libocdflashnor.la
 libocdflashnor_la_SOURCES = \

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index c721881915f0d14a63feb468a6b017f45ef02448..25585a4896468309717118949694c1ac6a06bbbe 100644 (file)
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,7 +1,4 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_builddir)/src \
-       -DPKGDATADIR=\"$(pkgdatadir)\"
+include $(top_srcdir)/common.mk
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libhelper.la

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 59cd8ffffd06b85192f95ab2773d2f5f1f57c255..fa964a352cb858e41dd2eaf7ccbf672f88af8711 100644 (file)
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -1,6 +1,4 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_builddir)/src
+include $(top_srcdir)/common.mk
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libjtag.la

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index 0588126545465b31123449ade72bc5df4b6cff19..f3d5ab0524d8a0860f821bb748ca8b6c3cadd287 100644 (file)
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -1,6 +1,4 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_builddir)/src
+include $(top_srcdir)/common.mk
 
 noinst_LTLIBRARIES = libocdjtagdrivers.la
 

diff --git a/src/pld/Makefile.am b/src/pld/Makefile.am
index 3993622e6c1a2a779e5dcaed001e2d8c30faa2d4..93b79f4a16c8dbe5c64dbc0b88f3e9db952d2274 100644 (file)
--- a/src/pld/Makefile.am
+++ b/src/pld/Makefile.am
@@ -1,6 +1,4 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_builddir)/src
+include $(top_srcdir)/common.mk
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libpld.la

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index ac24ebb5598cd7fbfd85479bccfff074e1990ae8..a7c318ce696b3016dbbe90a5486de0fc64f98d1d 100644 (file)
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,7 +1,4 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_builddir)/src \
-       -DPKGDATADIR=\"$(pkgdatadir)\"
+include $(top_srcdir)/common.mk
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libserver.la

diff --git a/src/svf/Makefile.am b/src/svf/Makefile.am
index 398f9676d61b89f43ff5ada368666ca64e443893..3a14d2087ad47525cb9c07529cfaac6f2c5bfc28 100644 (file)
--- a/src/svf/Makefile.am
+++ b/src/svf/Makefile.am
@@ -1,6 +1,4 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_builddir)/src
+include $(top_srcdir)/common.mk
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libsvf.la

diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index 1e29ae7d5c2400188d6e94a6cb8de8b8c17fa2ca..537c8c31754900779ac2bb2cd16b6bdad6c280f9 100644 (file)
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_srcdir)/common.mk
 
 if OOCD_TRACE
 OOCD_TRACE_FILES = oocd_trace.c
@@ -5,10 +6,6 @@ else
 OOCD_TRACE_FILES =
 endif
 
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_builddir)/src
-
 BIN2C          = $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD)
 
 DEBUG_HANDLER  = $(srcdir)/xscale/debug_handler.bin

diff --git a/src/xsvf/Makefile.am b/src/xsvf/Makefile.am
index f96331cd56b8a072a1addf332dac4dea99e74a56..1b9cfab00eaf63b885cd86209604c219913b828a 100644 (file)
--- a/src/xsvf/Makefile.am
+++ b/src/xsvf/Makefile.am
@@ -1,6 +1,4 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_builddir)/src
+include $(top_srcdir)/common.mk
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libxsvf.la