helper: Update jep106 database to JEP106AT

[fw/openocd] / src / helper / Makefile.am

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 6e1af8fd9e97298bbe06582a0e0a43acac674af8..64caf98b7da817aed83f966bee441fd93cf04773 100644 (file)
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,28 +1,56 @@
-INCLUDES = -I$(top_srcdir)/src $(all_includes) -I$(top_srcdir)/src/target
+include $(top_srcdir)/common.mk
+
 METASOURCES = AUTO
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
-noinst_LIBRARIES = libhelper.a
+noinst_LTLIBRARIES = libhelper.la
+
+CONFIGFILES = options.c time_support_common.c
+
+libhelper_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS)
 
-if ECOSBOARD
-CONFIGFILES = 
+libhelper_la_SOURCES = \
+       binarybuffer.c \
+       $(CONFIGFILES) \
+       configuration.c \
+       log.c \
+       command.c \
+       time_support.c \
+       replacements.c \
+       fileio.c \
+       util.c \
+       jep106.c \
+       jim-nvp.c
+
+if IOUTIL
+libhelper_la_SOURCES += ioutil.c
 else
-CONFIGFILES = options.c jim.c
+libhelper_la_SOURCES += ioutil_stubs.c
 endif
 
-libhelper_a_SOURCES = binarybuffer.c $(CONFIGFILES) configuration.c log.c command.c time_support.c \
-       replacements.c fileio.c startup_tcl.c
-
-noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
-       time_support.h replacements.h fileio.h jim.h
+libhelper_la_CFLAGS =
+if IS_MINGW
+# FD_* macros are sloppy with their signs on MinGW32 platform
+libhelper_la_CFLAGS += -Wno-sign-compare
+endif
 
+noinst_HEADERS = \
+       binarybuffer.h \
+       configuration.h \
+       ioutil.h \
+       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
 
-# Convert .tcl to cfile
-#
-# Fix!!! how do we make this more automake friendly?
-# 
-startup_tcl.c: startup.tcl
-       gcc -o bin2char $(srcdir)/bin2char.c 
-       ./bin2char startup_tcl < $(srcdir)/startup.tcl > $@
+EXTRA_DIST = startup.tcl
 
-# add startup_tcl.c to make clean list
-CLEANFILES = startup_tcl.c
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in