Browse Source

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>
tags/v0.5.0-rc1
Spencer Oliver 12 years ago
parent
commit
838cd58e24
13 changed files with 19 additions and 43 deletions
  1. +5
    -0
      common.mk
  2. +2
    -6
      src/Makefile.am
  3. +2
    -4
      src/flash/Makefile.am
  4. +1
    -3
      src/flash/nand/Makefile.am
  5. +1
    -3
      src/flash/nor/Makefile.am
  6. +1
    -4
      src/helper/Makefile.am
  7. +1
    -3
      src/jtag/Makefile.am
  8. +1
    -3
      src/jtag/drivers/Makefile.am
  9. +1
    -3
      src/pld/Makefile.am
  10. +1
    -4
      src/server/Makefile.am
  11. +1
    -3
      src/svf/Makefile.am
  12. +1
    -4
      src/target/Makefile.am
  13. +1
    -3
      src/xsvf/Makefile.am

+ 5
- 0
common.mk View File

@@ -0,0 +1,5 @@

# common flags used in openocd build
AM_CPPFLAGS = -I$(top_srcdir)/src \
-I$(top_builddir)/src \
-DPKGDATADIR=\"$(pkgdatadir)\"

+ 2
- 6
src/Makefile.am View File

@@ -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


+ 2
- 4
src/flash/Makefile.am View File

@@ -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 = \


+ 1
- 3
src/flash/nand/Makefile.am View File

@@ -1,6 +1,4 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_builddir)/src
include $(top_srcdir)/common.mk

noinst_LTLIBRARIES = libocdflashnand.la



+ 1
- 3
src/flash/nor/Makefile.am View File

@@ -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 = \


+ 1
- 4
src/helper/Makefile.am View File

@@ -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


+ 1
- 3
src/jtag/Makefile.am View File

@@ -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


+ 1
- 3
src/jtag/drivers/Makefile.am View File

@@ -1,6 +1,4 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_builddir)/src
include $(top_srcdir)/common.mk

noinst_LTLIBRARIES = libocdjtagdrivers.la



+ 1
- 3
src/pld/Makefile.am View File

@@ -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


+ 1
- 4
src/server/Makefile.am View File

@@ -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


+ 1
- 3
src/svf/Makefile.am View File

@@ -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


+ 1
- 4
src/target/Makefile.am View File

@@ -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


+ 1
- 3
src/xsvf/Makefile.am View File

@@ -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


Loading…
Cancel
Save