imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert to non-recursive make 

Change-Id: I11f8bc8553957e2ff083c09e72e16881e4d3bb6f
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/3865
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
This commit is contained in:
Andreas Fritiofson 2016-11-06 20:19:26 +01:00 committed by Paul Fertser
parent f2e93b597f
commit 5be455a710
26 changed files with 647 additions and 790 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -52,8 +52,8 @@ doc/openocd.pg
doc/openocd.toc doc/openocd.toc
doc/openocd.tp doc/openocd.tp
doc/openocd.vr doc/openocd.vr
doc/texinfo.tex
doc/version.texi doc/version.texi
texinfo.tex
src/openocd src/openocd
src/openocd.exe src/openocd.exe

64
Makefile.am
View File

@ -12,15 +12,34 @@ nobase_dist_pkgdata_DATA = \
contrib/libdcc/README \ contrib/libdcc/README \
contrib/99-openocd.rules contrib/99-openocd.rules
if INTERNAL_JIMTCL
SUBDIRS = jimtcl
else
SUBDIRS = SUBDIRS =
DIST_SUBDIRS =
bin_PROGRAMS =
noinst_LTLIBRARIES =
info_TEXINFOS =
dist_man_MANS =
EXTRA_DIST =
if INTERNAL_JIMTCL
SUBDIRS += jimtcl
DIST_SUBDIRS += jimtcl
endif endif
SUBDIRS += src doc # common flags used in openocd build
AM_CFLAGS = $(GCC_WARNINGS)
EXTRA_DIST = \ AM_CPPFLAGS = $(HOST_CPPFLAGS)\
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
-I$(top_srcdir)/src/helper \
-DPKGDATADIR=\"$(pkgdatadir)\" \
-DBINDIR=\"$(bindir)\"
if INTERNAL_JIMTCL
AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \
-I$(top_builddir)/jimtcl
endif
EXTRA_DIST += \
BUGS \ BUGS \
HACKING \ HACKING \
NEWTAPS \ NEWTAPS \
@ -96,17 +115,26 @@ distclean-local:
DISTCLEANFILES = doxygen.log DISTCLEANFILES = doxygen.log
METASOURCES = AUTO
BUILT_SOURCES =
CLEANFILES =
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
$(srcdir)/INSTALL \ %D%/INSTALL \
$(srcdir)/configure \ %D%/configure \
$(srcdir)/Makefile.in \ %D%/Makefile.in \
$(srcdir)/depcomp \ %D%/depcomp \
$(srcdir)/config.guess \ %D%/config.guess \
$(srcdir)/config.sub \ %D%/config.sub \
$(srcdir)/config.h.in \ %D%/config.h.in \
$(srcdir)/config.h.in~ \ %D%/config.h.in~ \
$(srcdir)/compile \ %D%/compile \
$(srcdir)/ltmain.sh \ %D%/ltmain.sh \
$(srcdir)/missing \ %D%/missing \
$(srcdir)/aclocal.m4 \ %D%/aclocal.m4 \
$(srcdir)/install-sh %D%/install-sh \
%D%/texinfo.tex
include src/Makefile.am
include doc/Makefile.am

2
README
View File

@ -214,7 +214,7 @@ You'll also need:
Additionally, for building from git: Additionally, for building from git:
- autoconf >= 2.64 - autoconf >= 2.64
- automake >= 1.9 - automake >= 1.14
- texinfo - texinfo
USB-based adapters depend on libusb-1.0 and some older drivers require USB-based adapters depend on libusb-1.0 and some older drivers require

15
common.mk
View File

@ -1,15 +0,0 @@
# common flags used in openocd build
AM_CFLAGS = $(GCC_WARNINGS)
AM_CPPFLAGS = $(HOST_CPPFLAGS)\
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
-I$(top_srcdir)/src/helper \
-DPKGDATADIR=\"$(pkgdatadir)\" \
-DBINDIR=\"$(bindir)\"
if INTERNAL_JIMTCL
AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \
-I$(top_builddir)/jimtcl
endif

19
configure.ac
View File

@ -794,25 +794,6 @@ AS_IF([test "x$gcc_warnings" = "xyes"], [
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
src/Makefile
src/helper/Makefile
src/jtag/Makefile
src/jtag/drivers/Makefile
src/jtag/drivers/usb_blaster/Makefile
src/jtag/hla/Makefile
src/jtag/aice/Makefile
src/transport/Makefile
src/target/openrisc/Makefile
src/xsvf/Makefile
src/svf/Makefile
src/target/Makefile
src/rtos/Makefile
src/server/Makefile
src/flash/Makefile
src/flash/nor/Makefile
src/flash/nand/Makefile
src/pld/Makefile
doc/Makefile
]) ])
AC_OUTPUT AC_OUTPUT

21
doc/Makefile.am
View File

@ -1,12 +1,11 @@
info_TEXINFOS = openocd.texi info_TEXINFOS += %D%/openocd.texi
openocd_TEXINFOS = fdl.texi %C%_openocd_TEXINFOS = %D%/fdl.texi
man_MANS = openocd.1
EXTRA_DIST = openocd.1 \
manual
MAINTAINERCLEANFILES = \ dist_man_MANS += %D%/openocd.1
$(srcdir)/Makefile.in \
$(srcdir)/mdate-sh \ EXTRA_DIST += %D%/manual
$(srcdir)/stamp-vti \
$(srcdir)/version.texi \ MAINTAINERCLEANFILES += \
$(srcdir)/texinfo.tex %D%/mdate-sh \
%D%/stamp-vti \
%D%/version.texi

134
src/Makefile.am
View File

@ -1,61 +1,41 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libopenocd.la
bin_PROGRAMS += %D%/openocd
SUBDIRS = \ %C%_openocd_SOURCES = \
jtag \ %D%/main.c
helper \
target \
transport \
flash \
svf \
xsvf \
pld \
server \
rtos
noinst_LTLIBRARIES = libopenocd.la %C%_libopenocd_la_SOURCES = \
bin_PROGRAMS = openocd %D%/hello.c %D%/hello.h \
%D%/openocd.c %D%/openocd.h
MAINFILE = main.c %C%_openocd_LDADD = %D%/libopenocd.la
openocd_SOURCES = $(MAINFILE) %C%_openocd_LDADD += $(MINGWLDADD)
openocd_LDADD = libopenocd.la
if INTERNAL_JIMTCL if INTERNAL_JIMTCL
openocd_LDADD += $(top_builddir)/jimtcl/libjim.a %C%_openocd_LDADD += $(top_builddir)/jimtcl/libjim.a
else else
openocd_LDADD += -ljim %C%_openocd_LDADD += -ljim
endif endif
if ULINK %C%_libopenocd_la_CPPFLAGS =
openocd_LDADD += -lm
endif
libopenocd_la_SOURCES = \
hello.c \
openocd.c
noinst_HEADERS = \
hello.h \
openocd.h
libopenocd_la_CPPFLAGS =
# banner output includes RELSTR appended to $VERSION from the configure script # banner output includes RELSTR appended to $VERSION from the configure script
# guess-rev.sh returns either a repository version ID or "-snapshot" # guess-rev.sh returns either a repository version ID or "-snapshot"
if RELEASE if RELEASE
libopenocd_la_CPPFLAGS += -DRELSTR=\"\" %C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"\"
libopenocd_la_CPPFLAGS += -DGITVERSION=\"\" %C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"\"
else else
libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\" %C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\" %C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
libopenocd_la_CPPFLAGS += -DPKGBLDDATE=\"`date +%F-%R`\" %C%_libopenocd_la_CPPFLAGS += -DPKGBLDDATE=\"`date +%F-%R`\"
endif endif
# add default CPPFLAGS # add default CPPFLAGS
libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS) %C%_libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
# the library search path. # the library search path.
libopenocd_la_LDFLAGS = $(all_libraries) %C%_libopenocd_la_LDFLAGS = $(all_libraries)
if IS_MINGW if IS_MINGW
MINGWLDADD = -lws2_32 MINGWLDADD = -lws2_32
@ -63,59 +43,43 @@ else
MINGWLDADD = MINGWLDADD =
endif endif
libopenocd_la_LIBADD = \ %C%_libopenocd_la_LIBADD = \
$(top_builddir)/src/xsvf/libxsvf.la \ %D%/xsvf/libxsvf.la \
$(top_builddir)/src/svf/libsvf.la \ %D%/svf/libsvf.la \
$(top_builddir)/src/pld/libpld.la \ %D%/pld/libpld.la \
$(top_builddir)/src/jtag/libjtag.la \ %D%/jtag/libjtag.la \
$(top_builddir)/src/transport/libtransport.la \ %D%/transport/libtransport.la \
$(top_builddir)/src/flash/libflash.la \ %D%/flash/libflash.la \
$(top_builddir)/src/target/libtarget.la \ %D%/target/libtarget.la \
$(top_builddir)/src/server/libserver.la \ %D%/server/libserver.la \
$(top_builddir)/src/rtos/librtos.la \ %D%/rtos/librtos.la \
$(top_builddir)/src/helper/libhelper.la \ %D%/helper/libhelper.la
$(LIBFTDI_LIBS) $(MINGWLDADD) \
$(HIDAPI_LIBS) $(LIBUSB0_LIBS) $(LIBUSB1_LIBS)
if !INTERNAL_LIBJAYLINK BIN2C = $(srcdir)/%D%/helper/bin2char.sh
libopenocd_la_LIBADD += $(LIBJAYLINK_LIBS)
endif
STARTUP_TCL_SRCS = \ STARTUP_TCL_SRCS =
$(srcdir)/helper/startup.tcl \ EXTRA_DIST += $(STARTUP_TCL_SRCS)
$(srcdir)/jtag/startup.tcl \
$(srcdir)/target/startup.tcl \
$(srcdir)/flash/startup.tcl \
$(srcdir)/server/startup.tcl
EXTRA_DIST = $(STARTUP_TCL_SRCS) BUILT_SOURCES += %D%/startup_tcl.inc
BUILT_SOURCES = startup_tcl.inc
startup.tcl: $(STARTUP_TCL_SRCS)
cat $^ > $@
BIN2C = $(top_srcdir)/src/helper/bin2char.sh
# Convert .tcl to c-array # Convert .tcl to c-array
startup_tcl.inc: startup.tcl $(BIN2C) %D%/startup_tcl.inc: $(STARTUP_TCL_SRCS)
$(BIN2C) < $< > $@ || { rm -f $@; false; } cat $^ | $(BIN2C) > $@ || { rm -f $@; false; }
# add generated files to make clean list # add generated files to make clean list
CLEANFILES = startup.tcl startup_tcl.inc CLEANFILES += %D%/startup_tcl.inc
# we do not want generated file in the dist # we do not want generated file in the dist
dist-hook: #dist-hook:
rm -f $(distdir)/startup_tcl.inc # rm -f $(distdir)/%D%/startup_tcl.inc
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
# The "quick" target builds executables & reinstalls the executables
# Primary use: developer types to quicken the edit/compile/debug
# cycle. by not requiring a "full build and full install". Note the
# assumption is: You are only rebuilding the EXE.... and everything
# else is/was previously installed.
#
# use at your own risk
quick: all install-binPROGRAMS
include %D%/helper/Makefile.am
include %D%/jtag/Makefile.am
include %D%/transport/Makefile.am
include %D%/xsvf/Makefile.am
include %D%/svf/Makefile.am
include %D%/target/Makefile.am
include %D%/rtos/Makefile.am
include %D%/server/Makefile.am
include %D%/flash/Makefile.am
include %D%/pld/Makefile.am

30
src/flash/Makefile.am
View File

@ -1,23 +1,13 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libflash.la
%C%_libflash_la_SOURCES = \
%D%/common.c %D%/common.h \
%D%/mflash.c %D%/mflash.h
SUBDIRS = \ %C%_libflash_la_LIBADD = \
nor \ %D%/nor/libocdflashnor.la \
nand %D%/nand/libocdflashnand.la
METASOURCES = AUTO STARTUP_TCL_SRCS += %D%/startup.tcl
noinst_LTLIBRARIES = libflash.la
libflash_la_SOURCES = \
common.c \
mflash.c
libflash_la_LIBADD = \ include %D%/nor/Makefile.am
$(top_builddir)/src/flash/nor/libocdflashnor.la \ include %D%/nand/Makefile.am
$(top_builddir)/src/flash/nand/libocdflashnand.la
noinst_HEADERS = \
common.h \
mflash.h
EXTRA_DIST = startup.tcl
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

79
src/flash/nand/Makefile.am
View File

@ -1,46 +1,43 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libocdflashnand.la
noinst_LTLIBRARIES = libocdflashnand.la %C%_libocdflashnand_la_SOURCES = \
%D%/ecc.c \
libocdflashnand_la_SOURCES = \ %D%/ecc_kw.c \
ecc.c \ %D%/core.c \
ecc_kw.c \ %D%/fileio.c \
core.c \ %D%/tcl.c \
fileio.c \ %D%/arm_io.c \
tcl.c \
arm_io.c \
$(NAND_DRIVERS) \ $(NAND_DRIVERS) \
driver.c %D%/driver.c \
$(NANDHEADERS)
NAND_DRIVERS = \ NAND_DRIVERS = \
nonce.c \ %D%/nonce.c \
davinci.c \ %D%/davinci.c \
lpc3180.c \ %D%/lpc3180.c \
lpc32xx.c \ %D%/lpc32xx.c \
mxc.c \ %D%/mxc.c \
mx3.c \ %D%/mx3.c \
orion.c \ %D%/orion.c \
s3c24xx.c \ %D%/s3c24xx.c \
s3c2410.c \ %D%/s3c2410.c \
s3c2412.c \ %D%/s3c2412.c \
s3c2440.c \ %D%/s3c2440.c \
s3c2443.c \ %D%/s3c2443.c \
s3c6400.c \ %D%/s3c6400.c \
at91sam9.c \ %D%/at91sam9.c \
nuc910.c %D%/nuc910.c
noinst_HEADERS = \ NANDHEADERS = \
arm_io.h \ %D%/arm_io.h \
core.h \ %D%/core.h \
driver.h \ %D%/driver.h \
fileio.h \ %D%/fileio.h \
imp.h \ %D%/imp.h \
lpc3180.h \ %D%/lpc3180.h \
lpc32xx.h \ %D%/lpc32xx.h \
mxc.h \ %D%/mxc.h \
mx3.h \ %D%/mx3.h \
s3c24xx.h \ %D%/s3c24xx.h \
s3c24xx_regs.h \ %D%/s3c24xx_regs.h \
nuc910.h %D%/nuc910.h
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

127
src/flash/nor/Makefile.am
View File

@ -1,69 +1,66 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libocdflashnor.la
%C%_libocdflashnor_la_SOURCES = \
noinst_LTLIBRARIES = libocdflashnor.la %D%/core.c \
libocdflashnor_la_SOURCES = \ %D%/tcl.c \
core.c \
tcl.c \
$(NOR_DRIVERS) \ $(NOR_DRIVERS) \
drivers.c %D%/drivers.c \
$(NORHEADERS)
NOR_DRIVERS = \ NOR_DRIVERS = \
aduc702x.c \ %D%/aduc702x.c \
aducm360.c \ %D%/aducm360.c \
ambiqmicro.c \ %D%/ambiqmicro.c \
at91sam4.c \ %D%/at91sam4.c \
at91sam4l.c \ %D%/at91sam4l.c \
at91samd.c \ %D%/at91samd.c \
at91sam3.c \ %D%/at91sam3.c \
at91sam7.c \ %D%/at91sam7.c \
atsamv.c \ %D%/atsamv.c \
avrf.c \ %D%/avrf.c \
cfi.c \ %D%/cfi.c \
dsp5680xx_flash.c \ %D%/dsp5680xx_flash.c \
efm32.c \ %D%/efm32.c \
em357.c \ %D%/em357.c \
faux.c \ %D%/faux.c \
fm3.c \ %D%/fm3.c \
fm4.c \ %D%/fm4.c \
jtagspi.c \ %D%/jtagspi.c \
kinetis.c \ %D%/kinetis.c \
kinetis_ke.c \ %D%/kinetis_ke.c \
lpc2000.c \ %D%/lpc2000.c \
lpc288x.c \ %D%/lpc288x.c \
lpc2900.c \ %D%/lpc2900.c \
lpcspifi.c \ %D%/lpcspifi.c \
mdr.c \ %D%/mdr.c \
mrvlqspi.c \ %D%/mrvlqspi.c \
niietcm4.c \ %D%/niietcm4.c \
non_cfi.c \ %D%/non_cfi.c \
nrf51.c \ %D%/nrf51.c \
numicro.c \ %D%/numicro.c \
ocl.c \ %D%/ocl.c \
pic32mx.c \ %D%/pic32mx.c \
psoc4.c \ %D%/psoc4.c \
sim3x.c \ %D%/sim3x.c \
spi.c \ %D%/spi.c \
stmsmi.c \ %D%/stmsmi.c \
stellaris.c \ %D%/stellaris.c \
stm32f1x.c \ %D%/stm32f1x.c \
stm32f2x.c \ %D%/stm32f2x.c \
stm32lx.c \ %D%/stm32lx.c \
stm32l4x.c \ %D%/stm32l4x.c \
str7x.c \ %D%/str7x.c \
str9x.c \ %D%/str9x.c \
str9xpec.c \ %D%/str9xpec.c \
tms470.c \ %D%/tms470.c \
virtual.c \ %D%/virtual.c \
xmc1xxx.c \ %D%/xmc1xxx.c \
xmc4xxx.c %D%/xmc4xxx.c
noinst_HEADERS = \ NORHEADERS = \
core.h \ %D%/core.h \
cfi.h \ %D%/cfi.h \
driver.h \ %D%/driver.h \
imp.h \ %D%/imp.h \
non_cfi.h \ %D%/non_cfi.h \
ocl.h \ %D%/ocl.h \
spi.h %D%/spi.h
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

83
src/helper/Makefile.am
View File

@ -1,56 +1,49 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libhelper.la
METASOURCES = AUTO %C%_libhelper_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS)
noinst_LTLIBRARIES = libhelper.la
CONFIGFILES = options.c time_support_common.c %C%_libhelper_la_SOURCES = \
%D%/binarybuffer.c \
libhelper_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) %D%/options.c \
%D%/time_support_common.c \
libhelper_la_SOURCES = \ %D%/configuration.c \
binarybuffer.c \ %D%/log.c \
$(CONFIGFILES) \ %D%/command.c \
configuration.c \ %D%/time_support.c \
log.c \ %D%/replacements.c \
command.c \ %D%/fileio.c \
time_support.c \ %D%/util.c \
replacements.c \ %D%/jep106.c \
fileio.c \ %D%/jim-nvp.c \
util.c \ %D%/binarybuffer.h \
jep106.c \ %D%/configuration.h \
jim-nvp.c %D%/ioutil.h \
%D%/list.h \
%D%/util.h \
%D%/types.h \
%D%/log.h \
%D%/command.h \
%D%/time_support.h \
%D%/replacements.h \
%D%/fileio.h \
%D%/system.h \
%D%/jep106.h \
%D%/jep106.inc \
%D%/jim-nvp.h
if IOUTIL if IOUTIL
libhelper_la_SOURCES += ioutil.c %C%_libhelper_la_SOURCES += %D%/ioutil.c
else else
libhelper_la_SOURCES += ioutil_stubs.c %C%_libhelper_la_SOURCES += %D%/ioutil_stubs.c
endif endif
libhelper_la_CFLAGS = %C%_libhelper_la_CFLAGS =
if IS_MINGW if IS_MINGW
# FD_* macros are sloppy with their signs on MinGW32 platform # FD_* macros are sloppy with their signs on MinGW32 platform
libhelper_la_CFLAGS += -Wno-sign-compare %C%_libhelper_la_CFLAGS += -Wno-sign-compare
endif endif
noinst_HEADERS = \ STARTUP_TCL_SRCS += %D%/startup.tcl
binarybuffer.h \ EXTRA_DIST += \
configuration.h \ %D%/bin2char.sh \
ioutil.h \ %D%/update_jep106.pl
list.h \
util.h \
types.h \
log.h \
command.h \
time_support.h \
replacements.h \
fileio.h \
system.h \
bin2char.sh \
jep106.h \
jep106.inc \
update_jep106.pl \
jim-nvp.h
EXTRA_DIST = startup.tcl
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

94
src/jtag/Makefile.am
View File

@ -1,86 +1,72 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libjtag.la
METASOURCES = AUTO JTAG_SRCS =
noinst_LTLIBRARIES = libjtag.la %C%_libjtag_la_LIBADD =
SUBDIRS = BUILT_SOURCES += %D%/minidriver_imp.h
DRIVERFILES = CLEANFILES += %D%/minidriver_imp.h
libjtag_la_LIBADD =
CLEANFILES =
BUILT_SOURCES =
BUILT_SOURCES += minidriver_imp.h
CLEANFILES += minidriver_imp.h
if MINIDRIVER if MINIDRIVER
if ZY1000 if ZY1000
DRIVERFILES += zy1000/zy1000.c JTAG_SRCS += %D%/zy1000/zy1000.c
JTAG_MINIDRIVER_DIR = $(srcdir)/zy1000 JTAG_MINIDRIVER_DIR = %D%/zy1000
endif endif
if MINIDRIVER_DUMMY if MINIDRIVER_DUMMY
DRIVERFILES += minidummy/minidummy.c commands.c JTAG_SRCS += %D%/minidummy/minidummy.c %D%/commands.c
JTAG_MINIDRIVER_DIR = $(srcdir)/minidummy JTAG_MINIDRIVER_DIR = %D%/minidummy
endif endif
MINIDRIVER_IMP_DIR = $(srcdir)/minidriver MINIDRIVER_IMP_DIR = %D%/minidriver
jtag_minidriver.h: $(JTAG_MINIDRIVER_DIR)/jtag_minidriver.h %D%/jtag_minidriver.h: $(JTAG_MINIDRIVER_DIR)/jtag_minidriver.h
cp $< $@ cp $< $@
BUILT_SOURCES += jtag_minidriver.h BUILT_SOURCES += %D%/jtag_minidriver.h
CLEANFILES += jtag_minidriver.h CLEANFILES += %D%/jtag_minidriver.h
else else
MINIDRIVER_IMP_DIR = $(srcdir)/drivers MINIDRIVER_IMP_DIR = %D%/drivers
DRIVERFILES += commands.c JTAG_SRCS += %D%/commands.c
if HLADAPTER if HLADAPTER
SUBDIRS += hla include %D%/hla/Makefile.am
libjtag_la_LIBADD += $(top_builddir)/src/jtag/hla/libocdhla.la %C%_libjtag_la_LIBADD += $(top_builddir)/%D%/hla/libocdhla.la
endif endif
if AICE if AICE
SUBDIRS += aice include %D%/aice/Makefile.am
libjtag_la_LIBADD += $(top_builddir)/src/jtag/aice/libocdaice.la %C%_libjtag_la_LIBADD += $(top_builddir)/%D%/aice/libocdaice.la
endif endif
SUBDIRS += drivers include %D%/drivers/Makefile.am
libjtag_la_LIBADD += $(top_builddir)/src/jtag/drivers/libocdjtagdrivers.la %C%_libjtag_la_LIBADD += $(top_builddir)/%D%/drivers/libocdjtagdrivers.la
endif endif
# endif // MINIDRIVER # endif // MINIDRIVER
minidriver_imp.h: $(MINIDRIVER_IMP_DIR)/minidriver_imp.h %D%/minidriver_imp.h: $(MINIDRIVER_IMP_DIR)/minidriver_imp.h
cp $< $@ cp $< $@
libjtag_la_SOURCES = \ %C%_libjtag_la_SOURCES = \
adapter.c \ %D%/adapter.c \
core.c \ %D%/core.c \
interface.c \ %D%/interface.c \
interfaces.c \ %D%/interfaces.c \
tcl.c \ %D%/tcl.c \
$(DRIVERFILES) %D%/commands.h \
%D%/driver.h \
%D%/interface.h \
%D%/interfaces.h \
%D%/minidriver.h \
%D%/jtag.h \
%D%/minidriver/minidriver_imp.h \
%D%/minidummy/jtag_minidriver.h \
%D%/swd.h \
%D%/tcl.h \
$(JTAG_SRCS)
noinst_HEADERS = \ STARTUP_TCL_SRCS += %D%/startup.tcl
commands.h \
driver.h \
interface.h \
interfaces.h \
minidriver.h \
jtag.h \
minidriver/minidriver_imp.h \
minidummy/jtag_minidriver.h \
swd.h \
tcl.h
EXTRA_DIST = startup.tcl
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

39
src/jtag/aice/Makefile.am
View File

@ -1,27 +1,14 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libocdaice.la
AM_CPPFLAGS += -I$(top_srcdir)/src/jtag/drivers $(LIBUSB1_CFLAGS) $(LIBUSB0_CFLAGS) %C%_libocdaice_la_CPPFLAGS = -I$(top_srcdir)/src/jtag/drivers $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) $(LIBUSB0_CFLAGS)
%C%_libocdaice_la_SOURCES = \
noinst_LTLIBRARIES = libocdaice.la %D%/aice_transport.c \
%D%/aice_interface.c \
libocdaice_la_SOURCES = \ %D%/aice_port.c \
$(AICEFILES) %D%/aice_usb.c \
%D%/aice_pipe.c \
AICEFILES = %D%/aice_transport.h \
%D%/aice_interface.h \
if AICE %D%/aice_port.h \
AICEFILES += aice_transport.c %D%/aice_usb.h \
AICEFILES += aice_interface.c %D%/aice_pipe.h
AICEFILES += aice_port.c
AICEFILES += aice_usb.c
AICEFILES += aice_pipe.c
endif
noinst_HEADERS = \
aice_transport.h \
aice_interface.h \
aice_port.h \
aice_usb.h \
aice_pipe.h
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

196
src/jtag/drivers/Makefile.am
View File

@ -1,172 +1,174 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libocdjtagdrivers.la
%C%_libocdjtagdrivers_la_LIBADD =
noinst_LTLIBRARIES = libocdjtagdrivers.la %C%_libocdjtagdrivers_la_SOURCES = \
libocdjtagdrivers_la_LIBADD = $(DRIVERFILES) \
$(DRIVERHEADERS)
libocdjtagdrivers_la_SOURCES = \ %C%_libocdjtagdrivers_la_CPPFLAGS = $(AM_CPPFLAGS)
$(DRIVERFILES)
libocdjtagdrivers_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) \ ULINK_FIRMWARE = %D%/OpenULINK
$(LIBUSB0_CFLAGS) $(HIDAPI_CFLAGS) $(LIBFTDI_CFLAGS)
ULINK_FIRMWARE = $(srcdir)/OpenULINK EXTRA_DIST += $(ULINK_FIRMWARE) \
%D%/usb_blaster/README.CheapClone \
EXTRA_DIST = $(ULINK_FIRMWARE) \ %D%/Makefile.rlink \
usb_blaster/README.CheapClone \ %D%/rlink_call.m4 \
Makefile.rlink \ %D%/rlink_init.m4
rlink_call.m4 \
rlink_init.m4
DRIVERFILES = DRIVERFILES =
SUBDIRS=
if JLINK
if INTERNAL_LIBJAYLINK
SUBDIRS += libjaylink
libjaylink_internal_la_SOURCES = jlink.c
libjaylink_internal_la_LIBADD = libjaylink/libjaylink/libjaylink.la
libjaylink_internal_la_CPPFLAGS = -I$(builddir)/libjaylink/libjaylink \
-I$(srcdir)/libjaylink $(AM_CPPFLAGS)
noinst_LTLIBRARIES += libjaylink_internal.la
libocdjtagdrivers_la_LIBADD += libjaylink_internal.la
else
DRIVERFILES += jlink.c
libocdjtagdrivers_la_CPPFLAGS += $(LIBJAYLINK_CFLAGS)
endif
endif
# Standard Driver: common files # Standard Driver: common files
DRIVERFILES += driver.c DRIVERFILES += %D%/driver.c
if USE_LIBUSB1 if USE_LIBUSB1
DRIVERFILES += libusb1_common.c DRIVERFILES += %D%/libusb1_common.c
%C%_libocdjtagdrivers_la_CPPFLAGS += $(LIBUSB1_CFLAGS)
%C%_libocdjtagdrivers_la_LIBADD += $(LIBUSB1_LIBS)
endif endif
if USE_LIBUSB0 if USE_LIBUSB0
DRIVERFILES += usb_common.c DRIVERFILES += %D%/usb_common.c
%C%_libocdjtagdrivers_la_CPPFLAGS += $(LIBUSB0_CFLAGS)
%C%_libocdjtagdrivers_la_LIBADD += $(LIBUSB0_LIBS)
if !USE_LIBUSB1 if !USE_LIBUSB1
DRIVERFILES += libusb0_common.c DRIVERFILES += %D%/libusb0_common.c
endif
endif
if USE_LIBFTDI
%C%_libocdjtagdrivers_la_CPPFLAGS += $(LIBFTDI_CFLAGS)
%C%_libocdjtagdrivers_la_LIBADD += $(LIBFTDI_LIBS)
endif
if USE_HIDAPI
%C%_libocdjtagdrivers_la_CPPFLAGS += $(HIDAPI_CFLAGS)
%C%_libocdjtagdrivers_la_LIBADD += $(HIDAPI_LIBS)
endif
if USE_LIBJAYLINK
%C%_libocdjtagdrivers_la_CPPFLAGS += $(LIBJAYLINK_CFLAGS)
%C%_libocdjtagdrivers_la_LIBADD += $(LIBJAYLINK_LIBS)
endif
if JLINK
DRIVERFILES += %D%/jlink.c
if INTERNAL_LIBJAYLINK
SUBDIRS += %D%/libjaylink
DIST_SUBDIRS += %D%/libjaylink
%C%_libocdjtagdrivers_la_LIBADD += %D%/libjaylink/libjaylink/libjaylink.la
%C%_libocdjtagdrivers_la_CPPFLAGS += -I$(builddir)/%D%/libjaylink/libjaylink -I$(srcdir)/%D%/libjaylink
endif endif
endif endif
if BITBANG if BITBANG
DRIVERFILES += bitbang.c DRIVERFILES += %D%/bitbang.c
endif endif
if PARPORT if PARPORT
DRIVERFILES += parport.c DRIVERFILES += %D%/parport.c
endif endif
if DUMMY if DUMMY
DRIVERFILES += dummy.c DRIVERFILES += %D%/dummy.c
endif endif
if FTDI if FTDI
DRIVERFILES += ftdi.c mpsse.c DRIVERFILES += %D%/ftdi.c %D%/mpsse.c
endif endif
if JTAG_VPI if JTAG_VPI
DRIVERFILES += jtag_vpi.c DRIVERFILES += %D%/jtag_vpi.c
endif endif
if USB_BLASTER_DRIVER if USB_BLASTER_DRIVER
SUBDIRS += usb_blaster %C%_libocdjtagdrivers_la_LIBADD += %D%/usb_blaster/libocdusbblaster.la
libocdjtagdrivers_la_LIBADD += $(top_builddir)/src/jtag/drivers/usb_blaster/libocdusbblaster.la
endif endif
if AMTJTAGACCEL if AMTJTAGACCEL
DRIVERFILES += amt_jtagaccel.c DRIVERFILES += %D%/amt_jtagaccel.c
endif endif
if EP93XX if EP93XX
DRIVERFILES += ep93xx.c DRIVERFILES += %D%/ep93xx.c
endif endif
if AT91RM9200 if AT91RM9200
DRIVERFILES += at91rm9200.c DRIVERFILES += %D%/at91rm9200.c
endif endif
if GW16012 if GW16012
DRIVERFILES += gw16012.c DRIVERFILES += %D%/gw16012.c
endif endif
if BITQ if BITQ
DRIVERFILES += bitq.c DRIVERFILES += %D%/bitq.c
endif endif
if PRESTO if PRESTO
DRIVERFILES += presto.c DRIVERFILES += %D%/presto.c
endif endif
if USBPROG if USBPROG
DRIVERFILES += usbprog.c DRIVERFILES += %D%/usbprog.c
endif endif
if RLINK if RLINK
DRIVERFILES += rlink.c rlink_speed_table.c DRIVERFILES += %D%/rlink.c %D%/rlink_speed_table.c
endif endif
if ULINK if ULINK
DRIVERFILES += ulink.c DRIVERFILES += %D%/ulink.c
ulinkdir = $(pkgdatadir)/OpenULINK ulinkdir = $(pkgdatadir)/OpenULINK
dist_ulink_DATA = $(ULINK_FIRMWARE)/ulink_firmware.hex dist_ulink_DATA = $(ULINK_FIRMWARE)/ulink_firmware.hex
%C%_libocdjtagdrivers_la_LIBADD += -lm
endif endif
if VSLLINK if VSLLINK
DRIVERFILES += versaloon/usbtoxxx/usbtogpio.c DRIVERFILES += %D%/versaloon/usbtoxxx/usbtogpio.c
DRIVERFILES += versaloon/usbtoxxx/usbtojtagraw.c DRIVERFILES += %D%/versaloon/usbtoxxx/usbtojtagraw.c
DRIVERFILES += versaloon/usbtoxxx/usbtoswd.c DRIVERFILES += %D%/versaloon/usbtoxxx/usbtoswd.c
DRIVERFILES += versaloon/usbtoxxx/usbtopwr.c DRIVERFILES += %D%/versaloon/usbtoxxx/usbtopwr.c
DRIVERFILES += versaloon/usbtoxxx/usbtoxxx.c DRIVERFILES += %D%/versaloon/usbtoxxx/usbtoxxx.c
DRIVERFILES += versaloon/versaloon.c DRIVERFILES += %D%/versaloon/versaloon.c
DRIVERFILES += vsllink.c DRIVERFILES += %D%/vsllink.c
endif endif
if ARMJTAGEW if ARMJTAGEW
DRIVERFILES += arm-jtag-ew.c DRIVERFILES += %D%/arm-jtag-ew.c
endif endif
if BUSPIRATE if BUSPIRATE
DRIVERFILES += buspirate.c DRIVERFILES += %D%/buspirate.c
endif endif
if REMOTE_BITBANG if REMOTE_BITBANG
DRIVERFILES += remote_bitbang.c DRIVERFILES += %D%/remote_bitbang.c
endif endif
if HLADAPTER if HLADAPTER
DRIVERFILES += stlink_usb.c DRIVERFILES += %D%/stlink_usb.c
DRIVERFILES += ti_icdi_usb.c DRIVERFILES += %D%/ti_icdi_usb.c
endif endif
if OSBDM if OSBDM
DRIVERFILES += osbdm.c DRIVERFILES += %D%/osbdm.c
endif endif
if OPENDOUS if OPENDOUS
DRIVERFILES += opendous.c DRIVERFILES += %D%/opendous.c
endif endif
if SYSFSGPIO if SYSFSGPIO
DRIVERFILES += sysfsgpio.c DRIVERFILES += %D%/sysfsgpio.c
endif endif
if BCM2835GPIO if BCM2835GPIO
DRIVERFILES += bcm2835gpio.c DRIVERFILES += %D%/bcm2835gpio.c
endif endif
if OPENJTAG if OPENJTAG
DRIVERFILES += openjtag.c DRIVERFILES += %D%/openjtag.c
endif endif
if CMSIS_DAP if CMSIS_DAP
DRIVERFILES += cmsis_dap_usb.c DRIVERFILES += %D%/cmsis_dap_usb.c
endif endif
noinst_HEADERS = \ DRIVERHEADERS = \
bitbang.h \ %D%/bitbang.h \
bitq.h \ %D%/bitq.h \
libusb0_common.h \ %D%/libusb0_common.h \
libusb1_common.h \ %D%/libusb1_common.h \
libusb_common.h \ %D%/libusb_common.h \
minidriver_imp.h \ %D%/minidriver_imp.h \
mpsse.h \ %D%/mpsse.h \
rlink.h \ %D%/rlink.h \
rlink_dtc_cmd.h \ %D%/rlink_dtc_cmd.h \
rlink_ep1_cmd.h \ %D%/rlink_ep1_cmd.h \
rlink_st7.h \ %D%/rlink_st7.h \
usb_common.h \ %D%/usb_common.h \
versaloon/usbtoxxx/usbtoxxx.h \ %D%/versaloon/usbtoxxx/usbtoxxx.h \
versaloon/usbtoxxx/usbtoxxx_internal.h \ %D%/versaloon/usbtoxxx/usbtoxxx_internal.h \
versaloon/versaloon.h \ %D%/versaloon/versaloon.h \
versaloon/versaloon_include.h \ %D%/versaloon/versaloon_include.h \
versaloon/versaloon_internal.h %D%/versaloon/versaloon_internal.h
DIST_SUBDIRS = usb_blaster include %D%/usb_blaster/Makefile.am
if JLINK
if INTERNAL_LIBJAYLINK
DIST_SUBDIRS += libjaylink
endif
endif
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

4
src/jtag/drivers/libusb_common.h
View File

@ -19,9 +19,9 @@
#define OPENOCD_JTAG_DRIVERS_LIBUSB_COMMON_H #define OPENOCD_JTAG_DRIVERS_LIBUSB_COMMON_H
#ifdef HAVE_LIBUSB1 #ifdef HAVE_LIBUSB1
#include <libusb1_common.h> #include "libusb1_common.h"
#else #else
#include <libusb0_common.h> #include "libusb0_common.h"
#endif #endif
#endif /* OPENOCD_JTAG_DRIVERS_LIBUSB_COMMON_H */ #endif /* OPENOCD_JTAG_DRIVERS_LIBUSB_COMMON_H */

19
src/jtag/drivers/usb_blaster/Makefile.am
View File

@ -1,20 +1,13 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libocdusbblaster.la
%C%_libocdusbblaster_la_SOURCES = $(USB_BLASTER_SRC)
%C%_libocdusbblaster_la_CPPFLAGS = -I$(top_srcdir)/src/jtag/drivers $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) $(LIBFTDI_CFLAGS)
AM_CPPFLAGS += -I$(top_srcdir)/src/jtag/drivers $(LIBUSB1_CFLAGS) $(LIBFTDI_CFLAGS) USB_BLASTER_SRC = %D%/usb_blaster.c %D%/ublast_access.h
noinst_LTLIBRARIES = libocdusbblaster.la
libocdusbblaster_la_SOURCES = $(USB_BLASTER_SRC)
USB_BLASTER_SRC = usb_blaster.c
if USB_BLASTER if USB_BLASTER
USB_BLASTER_SRC += ublast_access_ftdi.c USB_BLASTER_SRC += %D%/ublast_access_ftdi.c
endif endif
if USB_BLASTER_2 if USB_BLASTER_2
USB_BLASTER_SRC += ublast2_access_libusb.c USB_BLASTER_SRC += %D%/ublast2_access_libusb.c
endif endif
noinst_HEADERS = ublast_access.h
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

32
src/jtag/hla/Makefile.am
View File

@ -1,23 +1,11 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libocdhla.la
noinst_LTLIBRARIES = libocdhla.la %C%_libocdhla_la_SOURCES = \
%D%/hla_transport.c \
libocdhla_la_SOURCES = \ %D%/hla_tcl.c \
$(HLFILES) %D%/hla_interface.c \
%D%/hla_layout.c \
HLFILES = %D%/hla_transport.h \
%D%/hla_interface.h \
if HLADAPTER %D%/hla_layout.h \
HLFILES += hla_transport.c %D%/hla_tcl.h
HLFILES += hla_tcl.c
HLFILES += hla_interface.c
HLFILES += hla_layout.c
endif
noinst_HEADERS = \
hla_interface.h \
hla_layout.h \
hla_tcl.h \
hla_transport.h
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

16
src/pld/Makefile.am
View File

@ -1,8 +1,8 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libpld.la
%C%_libpld_la_SOURCES = \
METASOURCES = AUTO %D%/pld.c \
noinst_LTLIBRARIES = libpld.la %D%/xilinx_bit.c \
noinst_HEADERS = pld.h xilinx_bit.h virtex2.h %D%/virtex2.c \
libpld_la_SOURCES = pld.c xilinx_bit.c virtex2.c %D%/pld.h \
%D%/xilinx_bit.h \
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in %D%/virtex2.h

54
src/rtos/Makefile.am
View File

@ -1,32 +1,32 @@
# *************************************************************************** noinst_LTLIBRARIES += %D%/librtos.la
# * Copyright (C) 2011 by Broadcom Corporation * %C%_librtos_la_SOURCES = \
# * Evan Hunter - ehunter@broadcom.com * %D%/rtos.c \
# * * %D%/rtos_standard_stackings.c \
# * This program is free software; you can redistribute it and/or modify * %D%/rtos_ecos_stackings.c \
# * it under the terms of the GNU General Public License as published by * %D%/rtos_chibios_stackings.c \
# * the Free Software Foundation; either version 2 of the License, or * %D%/rtos_embkernel_stackings.c \
# * (at your option) any later version. * %D%/rtos_mqx_stackings.c \
# * * %D%/rtos_ucos_iii_stackings.c \
# * This program is distributed in the hope that it will be useful, * %D%/FreeRTOS.c \
# * but WITHOUT ANY WARRANTY; without even the implied warranty of * %D%/ThreadX.c \
# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * %D%/eCos.c \
# * GNU General Public License for more details. * %D%/linux.c \
# * * %D%/ChibiOS.c \
# * You should have received a copy of the GNU General Public License * %D%/embKernel.c \
# * along with this program. If not, see <http://www.gnu.org/licenses/>. * %D%/mqx.c \
# *************************************************************************** %D%/uCOS-III.c \
%D%/rtos.h \
%D%/rtos_standard_stackings.h \
%D%/rtos_ecos_stackings.h \
%D%/linux_header.h \
%D%/rtos_chibios_stackings.h \
%D%/rtos_embkernel_stackings.h \
%D%/rtos_mqx_stackings.h \
%D%/rtos_ucos_iii_stackings.h
include $(top_srcdir)/common.mk %C%_librtos_la_CFLAGS =
METASOURCES = AUTO
noinst_LTLIBRARIES = librtos.la
noinst_HEADERS = rtos.h rtos_standard_stackings.h rtos_ecos_stackings.h linux_header.h rtos_chibios_stackings.h rtos_embkernel_stackings.h rtos_mqx_stackings.h rtos_ucos_iii_stackings.h
librtos_la_SOURCES = rtos.c rtos_standard_stackings.c rtos_ecos_stackings.c rtos_chibios_stackings.c rtos_embkernel_stackings.c rtos_mqx_stackings.c rtos_ucos_iii_stackings.c FreeRTOS.c ThreadX.c eCos.c linux.c ChibiOS.c embKernel.c mqx.c uCOS-III.c
librtos_la_CFLAGS =
if IS_MINGW if IS_MINGW
# FD_* macros are sloppy with their signs on MinGW32 platform # FD_* macros are sloppy with their signs on MinGW32 platform
librtos_la_CFLAGS += -Wno-sign-compare %C%_librtos_la_CFLAGS += -Wno-sign-compare
endif endif
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

32
src/server/Makefile.am
View File

@ -1,23 +1,19 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libserver.la
%C%_libserver_la_SOURCES = \
%D%/server.c \
%D%/telnet_server.c \
%D%/gdb_server.c \
%D%/server.h \
%D%/telnet_server.h \
%D%/gdb_server.h \
%D%/server_stubs.c \
%D%/tcl_server.c \
%D%/tcl_server.h
METASOURCES = AUTO %C%_libserver_la_CFLAGS =
noinst_LTLIBRARIES = libserver.la
noinst_HEADERS = server.h telnet_server.h gdb_server.h
libserver_la_SOURCES = server.c telnet_server.c gdb_server.c
libserver_la_SOURCES += server_stubs.c
libserver_la_CFLAGS =
if IS_MINGW if IS_MINGW
# FD_* macros are sloppy with their signs on MinGW32 platform # FD_* macros are sloppy with their signs on MinGW32 platform
libserver_la_CFLAGS += -Wno-sign-compare %C%_libserver_la_CFLAGS += -Wno-sign-compare
endif endif
# tcl server addons STARTUP_TCL_SRCS += %D%/startup.tcl
noinst_HEADERS += tcl_server.h
libserver_la_SOURCES += tcl_server.c
EXTRA_DIST = \
startup.tcl
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

10
src/svf/Makefile.am
View File

@ -1,8 +1,2 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libsvf.la
%C%_libsvf_la_SOURCES = %D%/svf.c %D%/svf.h
METASOURCES = AUTO
noinst_LTLIBRARIES = libsvf.la
noinst_HEADERS = svf.h
libsvf_la_SOURCES = svf.c
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

308
src/target/Makefile.am
View File

@ -1,18 +1,15 @@
include $(top_srcdir)/common.mk
if OOCD_TRACE if OOCD_TRACE
OOCD_TRACE_FILES = oocd_trace.c OOCD_TRACE_FILES = %D%/oocd_trace.c
else else
OOCD_TRACE_FILES = OOCD_TRACE_FILES =
endif endif
SUBDIRS = openrisc %C%_libtarget_la_LIBADD = %D%/openrisc/libopenrisc.la
libtarget_la_LIBADD = $(top_builddir)/src/target/openrisc/libopenrisc.la
STARTUP_TCL_SRCS += %D%/startup.tcl
METASOURCES = AUTO noinst_LTLIBRARIES += %D%/libtarget.la
noinst_LTLIBRARIES = libtarget.la %C%_libtarget_la_SOURCES = \
libtarget_la_SOURCES = \
$(TARGET_CORE_SRC) \ $(TARGET_CORE_SRC) \
$(ARM_DEBUG_SRC) \ $(ARM_DEBUG_SRC) \
$(ARMV4_5_SRC) \ $(ARMV4_5_SRC) \
@ -23,178 +20,175 @@ libtarget_la_SOURCES = \
$(MIPS32_SRC) \ $(MIPS32_SRC) \
$(NDS32_SRC) \ $(NDS32_SRC) \
$(INTEL_IA32_SRC) \ $(INTEL_IA32_SRC) \
avrt.c \ %D%/avrt.c \
dsp563xx.c \ %D%/dsp563xx.c \
dsp563xx_once.c \ %D%/dsp563xx_once.c \
dsp5680xx.c \ %D%/dsp5680xx.c \
hla_target.c %D%/hla_target.c
TARGET_CORE_SRC = \ TARGET_CORE_SRC = \
algorithm.c \ %D%/algorithm.c \
register.c \ %D%/register.c \
image.c \ %D%/image.c \
breakpoints.c \ %D%/breakpoints.c \
target.c \ %D%/target.c \
target_request.c \ %D%/target_request.c \
testee.c \ %D%/testee.c \
smp.c %D%/smp.c
ARMV4_5_SRC = \ ARMV4_5_SRC = \
armv4_5.c \ %D%/armv4_5.c \
armv4_5_mmu.c \ %D%/armv4_5_mmu.c \
armv4_5_cache.c \ %D%/armv4_5_cache.c \
$(ARM7_9_SRC) $(ARM7_9_SRC)
ARM7_9_SRC = \ ARM7_9_SRC = \
arm7_9_common.c \ %D%/arm7_9_common.c \
arm7tdmi.c \ %D%/arm7tdmi.c \
arm720t.c \ %D%/arm720t.c \
arm9tdmi.c \ %D%/arm9tdmi.c \
arm920t.c \ %D%/arm920t.c \
arm966e.c \ %D%/arm966e.c \
arm946e.c \ %D%/arm946e.c \
arm926ejs.c \ %D%/arm926ejs.c \
feroceon.c %D%/feroceon.c
ARM_MISC_SRC = \ ARM_MISC_SRC = \
fa526.c \ %D%/fa526.c \
xscale.c %D%/xscale.c
ARMV6_SRC = \ ARMV6_SRC = \
arm11.c \ %D%/arm11.c \
arm11_dbgtap.c %D%/arm11_dbgtap.c
ARMV7_SRC = \ ARMV7_SRC = \
armv7m.c \ %D%/armv7m.c \
armv7m_trace.c \ %D%/armv7m_trace.c \
cortex_m.c \ %D%/cortex_m.c \
armv7a.c \ %D%/armv7a.c \
cortex_a.c \ %D%/cortex_a.c \
ls1_sap.c %D%/ls1_sap.c
ARM_DEBUG_SRC = \ ARM_DEBUG_SRC = \
arm_dpm.c \ %D%/arm_dpm.c \
arm_jtag.c \ %D%/arm_jtag.c \
arm_disassembler.c \ %D%/arm_disassembler.c \
arm_simulator.c \ %D%/arm_simulator.c \
arm_semihosting.c \ %D%/arm_semihosting.c \
arm_adi_v5.c \ %D%/arm_adi_v5.c \
armv7a_cache.c \ %D%/armv7a_cache.c \
armv7a_cache_l2x.c \ %D%/armv7a_cache_l2x.c \
adi_v5_jtag.c \ %D%/adi_v5_jtag.c \
adi_v5_swd.c \ %D%/adi_v5_swd.c \
embeddedice.c \ %D%/embeddedice.c \
trace.c \ %D%/trace.c \
etb.c \ %D%/etb.c \
etm.c \ %D%/etm.c \
$(OOCD_TRACE_FILES) \ $(OOCD_TRACE_FILES) \
etm_dummy.c %D%/etm_dummy.c
AVR32_SRC = \ AVR32_SRC = \
avr32_ap7k.c \ %D%/avr32_ap7k.c \
avr32_jtag.c \ %D%/avr32_jtag.c \
avr32_mem.c \ %D%/avr32_mem.c \
avr32_regs.c %D%/avr32_regs.c
MIPS32_SRC = \ MIPS32_SRC = \
mips32.c \ %D%/mips32.c \
mips_m4k.c \ %D%/mips_m4k.c \
mips32_pracc.c \ %D%/mips32_pracc.c \
mips32_dmaacc.c \ %D%/mips32_dmaacc.c \
mips_ejtag.c %D%/mips_ejtag.c
NDS32_SRC = \ NDS32_SRC = \
nds32.c \ %D%/nds32.c \
nds32_reg.c \ %D%/nds32_reg.c \
nds32_cmd.c \ %D%/nds32_cmd.c \
nds32_disassembler.c \ %D%/nds32_disassembler.c \
nds32_tlb.c \ %D%/nds32_tlb.c \
nds32_v2.c \ %D%/nds32_v2.c \
nds32_v3_common.c \ %D%/nds32_v3_common.c \
nds32_v3.c \ %D%/nds32_v3.c \
nds32_v3m.c \ %D%/nds32_v3m.c \
nds32_aice.c %D%/nds32_aice.c
INTEL_IA32_SRC = \ INTEL_IA32_SRC = \
quark_x10xx.c \ %D%/quark_x10xx.c \
quark_d20xx.c \ %D%/quark_d20xx.c \
lakemont.c \ %D%/lakemont.c \
x86_32_common.c %D%/x86_32_common.c
noinst_HEADERS = \ %C%_libtarget_la_SOURCES += \
algorithm.h \ %D%/algorithm.h \
arm.h \ %D%/arm.h \
arm_dpm.h \ %D%/arm_dpm.h \
arm_jtag.h \ %D%/arm_jtag.h \
arm_adi_v5.h \ %D%/arm_adi_v5.h \
armv7a_cache.h \ %D%/armv7a_cache.h \
armv7a_cache_l2x.h \ %D%/armv7a_cache_l2x.h \
arm_disassembler.h \ %D%/arm_disassembler.h \
arm_opcodes.h \ %D%/arm_opcodes.h \
arm_simulator.h \ %D%/arm_simulator.h \
arm_semihosting.h \ %D%/arm_semihosting.h \
arm7_9_common.h \ %D%/arm7_9_common.h \
arm7tdmi.h \ %D%/arm7tdmi.h \
arm720t.h \ %D%/arm720t.h \
arm9tdmi.h \ %D%/arm9tdmi.h \
arm920t.h \ %D%/arm920t.h \
arm926ejs.h \ %D%/arm926ejs.h \
arm966e.h \ %D%/arm966e.h \
arm946e.h \ %D%/arm946e.h \
arm11.h \ %D%/arm11.h \
arm11_dbgtap.h \ %D%/arm11_dbgtap.h \
armv4_5.h \ %D%/armv4_5.h \
armv4_5_mmu.h \ %D%/armv4_5_mmu.h \
armv4_5_cache.h \ %D%/armv4_5_cache.h \
armv7a.h \ %D%/armv7a.h \
armv7m.h \ %D%/armv7m.h \
armv7m_trace.h \ %D%/armv7m_trace.h \
avrt.h \ %D%/avrt.h \
dsp563xx.h \ %D%/dsp563xx.h \
dsp563xx_once.h \ %D%/dsp563xx_once.h \
dsp5680xx.h \ %D%/dsp5680xx.h \
breakpoints.h \ %D%/breakpoints.h \
cortex_m.h \ %D%/cortex_m.h \
cortex_a.h \ %D%/cortex_a.h \
embeddedice.h \ %D%/embeddedice.h \
etb.h \ %D%/etb.h \
etm.h \ %D%/etm.h \
etm_dummy.h \ %D%/etm_dummy.h \
image.h \ %D%/image.h \
mips32.h \ %D%/mips32.h \
mips_m4k.h \ %D%/mips_m4k.h \
mips_ejtag.h \ %D%/mips_ejtag.h \
mips32_pracc.h \ %D%/mips32_pracc.h \
mips32_dmaacc.h \ %D%/mips32_dmaacc.h \
oocd_trace.h \ %D%/oocd_trace.h \
register.h \ %D%/register.h \
target.h \ %D%/target.h \
target_type.h \ %D%/target_type.h \
trace.h \ %D%/trace.h \
target_request.h \ %D%/target_request.h \
trace.h \ %D%/trace.h \
xscale.h \ %D%/xscale.h \
smp.h \ %D%/smp.h \
avr32_ap7k.h \ %D%/avr32_ap7k.h \
avr32_jtag.h \ %D%/avr32_jtag.h \
avr32_mem.h \ %D%/avr32_mem.h \
avr32_regs.h \ %D%/avr32_regs.h \
nds32.h \ %D%/nds32.h \
nds32_cmd.h \ %D%/nds32_cmd.h \
nds32_disassembler.h \ %D%/nds32_disassembler.h \
nds32_edm.h \ %D%/nds32_edm.h \
nds32_insn.h \ %D%/nds32_insn.h \
nds32_reg.h \ %D%/nds32_reg.h \
nds32_tlb.h \ %D%/nds32_tlb.h \
nds32_v2.h \ %D%/nds32_v2.h \
nds32_v3_common.h \ %D%/nds32_v3_common.h \
nds32_v3.h \ %D%/nds32_v3.h \
nds32_v3m.h \ %D%/nds32_v3m.h \
nds32_aice.h \ %D%/nds32_aice.h \
lakemont.h \ %D%/lakemont.h \
x86_32_common.h %D%/x86_32_common.h
ocddatadir = $(pkglibdir) include %D%/openrisc/Makefile.am
nobase_dist_ocddata_DATA =
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

2
src/target/breakpoints.h
View File

@ -19,6 +19,8 @@
#ifndef OPENOCD_TARGET_BREAKPOINTS_H #ifndef OPENOCD_TARGET_BREAKPOINTS_H
#define OPENOCD_TARGET_BREAKPOINTS_H #define OPENOCD_TARGET_BREAKPOINTS_H
#include <stdint.h>
struct target; struct target;
enum breakpoint_type { enum breakpoint_type {

30
src/target/openrisc/Makefile.am
View File

@ -1,18 +1,12 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libopenrisc.la
%C%_libopenrisc_la_SOURCES = \
noinst_LTLIBRARIES = libopenrisc.la %D%/or1k.c \
libopenrisc_la_SOURCES = $(OPENRISC_SRC) %D%/or1k_du_adv.c \
%D%/or1k_tap_mohor.c \
OPENRISC_SRC = \ %D%/or1k_tap_vjtag.c \
or1k.c \ %D%/or1k_tap_xilinx_bscan.c \
or1k_du_adv.c \ %D%/jsp_server.c \
or1k_tap_mohor.c \ %D%/or1k.h \
or1k_tap_vjtag.c \ %D%/or1k_du.h \
or1k_tap_xilinx_bscan.c \ %D%/or1k_tap.h \
jsp_server.c %D%/jsp_server.h
noinst_HEADERS = \
or1k.h \
or1k_du.h \
or1k_tap.h \
jsp_server.h

15
src/transport/Makefile.am
View File

@ -1,11 +1,4 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libtransport.la
%C%_libtransport_la_SOURCES = \
#METASOURCES = AUTO %D%/transport.c \
noinst_LTLIBRARIES = libtransport.la %D%/transport.h
libtransport_la_SOURCES = \
transport.c
noinst_HEADERS = \
transport.h
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

10
src/xsvf/Makefile.am
View File

@ -1,8 +1,2 @@
include $(top_srcdir)/common.mk noinst_LTLIBRARIES += %D%/libxsvf.la
%C%_libxsvf_la_SOURCES = %D%/xsvf.c %D%/xsvf.h
METASOURCES = AUTO
noinst_LTLIBRARIES = libxsvf.la
noinst_HEADERS = xsvf.h
libxsvf_la_SOURCES = xsvf.c
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in