X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=e0f7f49bb0f4ffbc9183314a9e0726472999b10a;hp=d81e7d20dfe4335b88d62753fa300d891b7138a7;hb=8b66c96974cafa24ebcd2739aae5e1a5a64fdf22;hpb=b1cf5423efc88b2a78788db22df41df1b6edc59a

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index d81e7d20df..e0f7f49bb0 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,27 +1,49 @@
-INCLUDES = -I$(top_srcdir)/src $(all_includes) -I$(top_srcdir)/src/target
-METASOURCES = AUTO
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
-noinst_LIBRARIES = libhelper.a
+noinst_LTLIBRARIES += %D%/libhelper.la
 
-if ECOSBOARD
-CONFIGFILES = 
-else
-CONFIGFILES = options.c jim.c jim-eventloop.c 
-endif
-
-libhelper_a_SOURCES = binarybuffer.c $(CONFIGFILES) configuration.c log.c command.c time_support.c \
-	replacements.c fileio.c startup_tcl.c
+%C%_libhelper_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS)
 
-noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
-	time_support.h replacements.h fileio.h jim.h jim-eventloop.h \
-	startup.tcl bin2char.c
+%C%_libhelper_la_SOURCES = \
+	%D%/binarybuffer.c \
+	%D%/options.c \
+	%D%/time_support_common.c \
+	%D%/configuration.c \
+	%D%/log.c \
+	%D%/command.c \
+	%D%/time_support.c \
+	%D%/replacements.c \
+	%D%/fileio.c \
+	%D%/util.c \
+	%D%/jep106.c \
+	%D%/jim-nvp.c \
+	%D%/binarybuffer.h \
+	%D%/configuration.h \
+	%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
 
-bin2char$(EXEEXT_FOR_BUILD): bin2char.c
-	${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
+if IOUTIL
+%C%_libhelper_la_SOURCES += %D%/ioutil.c
+else
+%C%_libhelper_la_SOURCES += %D%/ioutil_stubs.c
+endif
 
-# Convert .tcl to cfile
-startup_tcl.c: startup.tcl bin2char$(EXEEXT_FOR_BUILD)
-	./bin2char$(EXEEXT_FOR_BUILD) startup_tcl < $(srcdir)/startup.tcl > $@
+%C%_libhelper_la_CFLAGS = $(AM_CFLAGS)
+if IS_MINGW
+# FD_* macros are sloppy with their signs on MinGW32 platform
+%C%_libhelper_la_CFLAGS += -Wno-sign-compare
+endif
 
-# add startup_tcl.c to make clean list
-CLEANFILES = startup_tcl.c bin2char$(EXEEXT_FOR_BUILD)
+STARTUP_TCL_SRCS += %D%/startup.tcl
+EXTRA_DIST += \
+	%D%/bin2char.sh \
+	%D%/update_jep106.pl