X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=e0f7f49bb0f4ffbc9183314a9e0726472999b10a;hb=766d6114fea0c2748ed281db866588f975d2ba83;hp=630fbf50a92616e86d00b8e069b0672da19465fe;hpb=60ba4476dfef5fae48b85d54e376a3ca27442113;p=openocd.git

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 630fbf50a9..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
-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
+%C%_libhelper_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS)
 
-noinst_PROGRAMS = bin2char
+%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_SOURCES = bin2char.c
+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)
-	./bin2char$(EXEEXT) startup_tcl < $(srcdir)/$< > $@
+%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
+STARTUP_TCL_SRCS += %D%/startup.tcl
+EXTRA_DIST += \
+	%D%/bin2char.sh \
+	%D%/update_jep106.pl