projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stm32f0x: Remove duplicate code for revision string.
[fw/openocd]
/
src
/
helper
/
Makefile.am
diff --git
a/src/helper/Makefile.am
b/src/helper/Makefile.am
index c721881915f0d14a63feb468a6b017f45ef02448..9477267f6cfa550a2ed2bff8f18af8ec7d14d0db 100644
(file)
--- a/
src/helper/Makefile.am
+++ b/
src/helper/Makefile.am
@@
-1,18
+1,11
@@
-AM_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_builddir)/src \
- -DPKGDATADIR=\"$(pkgdatadir)\"
+include $(top_srcdir)/common.mk
METASOURCES = AUTO
noinst_LTLIBRARIES = libhelper.la
METASOURCES = AUTO
noinst_LTLIBRARIES = libhelper.la
-if ECOSBOARD
-CONFIGFILES = time_support_ecos.c
-else
CONFIGFILES = options.c time_support_common.c
CONFIGFILES = options.c time_support_common.c
-endif
-
+libhelper_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS)
libhelper_la_SOURCES = \
binarybuffer.c \
libhelper_la_SOURCES = \
binarybuffer.c \
@@
-23,7
+16,8
@@
libhelper_la_SOURCES = \
time_support.c \
replacements.c \
fileio.c \
time_support.c \
replacements.c \
fileio.c \
- util.c
+ util.c \
+ jim-nvp.c
if IOUTIL
libhelper_la_SOURCES += ioutil.c
if IOUTIL
libhelper_la_SOURCES += ioutil.c
@@
-41,6
+35,7
@@
noinst_HEADERS = \
binarybuffer.h \
configuration.h \
ioutil.h \
binarybuffer.h \
configuration.h \
ioutil.h \
+ list.h \
util.h \
types.h \
log.h \
util.h \
types.h \
log.h \
@@
-49,17
+44,9
@@
noinst_HEADERS = \
replacements.h \
fileio.h \
system.h \
replacements.h \
fileio.h \
system.h \
- bin2char.c
+ bin2char.sh \
+ jim-nvp.h
EXTRA_DIST = startup.tcl
EXTRA_DIST = startup.tcl
-BIN2C = bin2char$(EXEEXT_FOR_BUILD)
-
-BUILT_SOURCES = $(BIN2C)
-
-$(BIN2C): bin2char.c
- ${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
-
-CLEANFILES = bin2char$(EXEEXT_FOR_BUILD)
-
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in