X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=c9479b43edb18aba62a6f098f952e75d63059262;hp=5720b9d79a896969b8d44377bc2871b8345e7bf2;hb=ef885d3b2a3001325f525df250dadd570e5d743e;hpb=82d2633b5f550115e9e7c7d0520babb6680aa38f

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 5720b9d79a..c9479b43ed 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,6 +1,64 @@
-INCLUDES = $(all_includes)
+include $(top_srcdir)/common.mk
+
 METASOURCES = AUTO
-noinst_LIBRARIES = libhelper.a
-libhelper_a_SOURCES = binarybuffer.c configuration.c log.c interpreter.c command.c time_support.c replacements.c
-noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
-	interpreter.h time_support.h replacements.h
+noinst_LTLIBRARIES = libhelper.la
+
+if ECOSBOARD
+CONFIGFILES = time_support_ecos.c
+else
+CONFIGFILES = options.c time_support_common.c
+endif
+
+
+
+libhelper_la_SOURCES = \
+	binarybuffer.c \
+	$(CONFIGFILES) \
+	configuration.c \
+	log.c \
+	command.c \
+	time_support.c \
+	replacements.c \
+	fileio.c \
+	util.c \
+	jim-nvp.c
+
+if IOUTIL
+libhelper_la_SOURCES += ioutil.c
+else
+libhelper_la_SOURCES += ioutil_stubs.c
+endif
+
+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 \
+	util.h \
+	types.h \
+	log.h \
+	command.h \
+	time_support.h \
+	replacements.h \
+	fileio.h \
+	system.h \
+	bin2char.c \
+	jim-nvp.h
+
+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