Rather than specifying common makefile variables move them all to a common.mk. Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>tags/v0.5.0-rc1
@@ -0,0 +1,5 @@ | |||||
# common flags used in openocd build | |||||
AM_CPPFLAGS = -I$(top_srcdir)/src \ | |||||
-I$(top_builddir)/src \ | |||||
-DPKGDATADIR=\"$(pkgdatadir)\" |
@@ -1,3 +1,5 @@ | |||||
include $(top_srcdir)/common.mk | |||||
SUBDIRS = \ | SUBDIRS = \ | ||||
jtag \ | jtag \ | ||||
helper \ | helper \ | ||||
@@ -29,12 +31,6 @@ noinst_HEADERS = \ | |||||
hello.h \ | hello.h \ | ||||
openocd.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`\" | libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\" | ||||
# banner output includes RELSTR appended to $VERSION from the configure script | # banner output includes RELSTR appended to $VERSION from the configure script | ||||
@@ -1,11 +1,9 @@ | |||||
include $(top_srcdir)/common.mk | |||||
SUBDIRS = \ | SUBDIRS = \ | ||||
nor \ | nor \ | ||||
nand | nand | ||||
AM_CPPFLAGS = \ | |||||
-I$(top_srcdir)/src \ | |||||
-I$(top_builddir)/src | |||||
METASOURCES = AUTO | METASOURCES = AUTO | ||||
noinst_LTLIBRARIES = libflash.la | noinst_LTLIBRARIES = libflash.la | ||||
libflash_la_SOURCES = \ | libflash_la_SOURCES = \ | ||||
@@ -1,6 +1,4 @@ | |||||
AM_CPPFLAGS = \ | |||||
-I$(top_srcdir)/src \ | |||||
-I$(top_builddir)/src | |||||
include $(top_srcdir)/common.mk | |||||
noinst_LTLIBRARIES = libocdflashnand.la | noinst_LTLIBRARIES = libocdflashnand.la | ||||
@@ -1,6 +1,4 @@ | |||||
AM_CPPFLAGS = \ | |||||
-I$(top_srcdir)/src \ | |||||
-I$(top_builddir)/src | |||||
include $(top_srcdir)/common.mk | |||||
noinst_LTLIBRARIES = libocdflashnor.la | noinst_LTLIBRARIES = libocdflashnor.la | ||||
libocdflashnor_la_SOURCES = \ | libocdflashnor_la_SOURCES = \ | ||||
@@ -1,7 +1,4 @@ | |||||
AM_CPPFLAGS = \ | |||||
-I$(top_srcdir)/src \ | |||||
-I$(top_builddir)/src \ | |||||
-DPKGDATADIR=\"$(pkgdatadir)\" | |||||
include $(top_srcdir)/common.mk | |||||
METASOURCES = AUTO | METASOURCES = AUTO | ||||
noinst_LTLIBRARIES = libhelper.la | noinst_LTLIBRARIES = libhelper.la | ||||
@@ -1,6 +1,4 @@ | |||||
AM_CPPFLAGS = \ | |||||
-I$(top_srcdir)/src \ | |||||
-I$(top_builddir)/src | |||||
include $(top_srcdir)/common.mk | |||||
METASOURCES = AUTO | METASOURCES = AUTO | ||||
noinst_LTLIBRARIES = libjtag.la | noinst_LTLIBRARIES = libjtag.la | ||||
@@ -1,6 +1,4 @@ | |||||
AM_CPPFLAGS = \ | |||||
-I$(top_srcdir)/src \ | |||||
-I$(top_builddir)/src | |||||
include $(top_srcdir)/common.mk | |||||
noinst_LTLIBRARIES = libocdjtagdrivers.la | noinst_LTLIBRARIES = libocdjtagdrivers.la | ||||
@@ -1,6 +1,4 @@ | |||||
AM_CPPFLAGS = \ | |||||
-I$(top_srcdir)/src \ | |||||
-I$(top_builddir)/src | |||||
include $(top_srcdir)/common.mk | |||||
METASOURCES = AUTO | METASOURCES = AUTO | ||||
noinst_LTLIBRARIES = libpld.la | noinst_LTLIBRARIES = libpld.la | ||||
@@ -1,7 +1,4 @@ | |||||
AM_CPPFLAGS = \ | |||||
-I$(top_srcdir)/src \ | |||||
-I$(top_builddir)/src \ | |||||
-DPKGDATADIR=\"$(pkgdatadir)\" | |||||
include $(top_srcdir)/common.mk | |||||
METASOURCES = AUTO | METASOURCES = AUTO | ||||
noinst_LTLIBRARIES = libserver.la | noinst_LTLIBRARIES = libserver.la | ||||
@@ -1,6 +1,4 @@ | |||||
AM_CPPFLAGS = \ | |||||
-I$(top_srcdir)/src \ | |||||
-I$(top_builddir)/src | |||||
include $(top_srcdir)/common.mk | |||||
METASOURCES = AUTO | METASOURCES = AUTO | ||||
noinst_LTLIBRARIES = libsvf.la | noinst_LTLIBRARIES = libsvf.la | ||||
@@ -1,3 +1,4 @@ | |||||
include $(top_srcdir)/common.mk | |||||
if OOCD_TRACE | if OOCD_TRACE | ||||
OOCD_TRACE_FILES = oocd_trace.c | OOCD_TRACE_FILES = oocd_trace.c | ||||
@@ -5,10 +6,6 @@ else | |||||
OOCD_TRACE_FILES = | OOCD_TRACE_FILES = | ||||
endif | endif | ||||
AM_CPPFLAGS = \ | |||||
-I$(top_srcdir)/src \ | |||||
-I$(top_builddir)/src | |||||
BIN2C = $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD) | BIN2C = $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD) | ||||
DEBUG_HANDLER = $(srcdir)/xscale/debug_handler.bin | DEBUG_HANDLER = $(srcdir)/xscale/debug_handler.bin | ||||
@@ -1,6 +1,4 @@ | |||||
AM_CPPFLAGS = \ | |||||
-I$(top_srcdir)/src \ | |||||
-I$(top_builddir)/src | |||||
include $(top_srcdir)/common.mk | |||||
METASOURCES = AUTO | METASOURCES = AUTO | ||||
noinst_LTLIBRARIES = libxsvf.la | noinst_LTLIBRARIES = libxsvf.la | ||||