X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=4f74b9aedcd0709a8cbb42c255bb20a23723fb9c;hp=2ba0a5630fa80b731913bcd6306cd26240c296f3;hb=822c06d9e3983b37cd1830c594210973cb560991;hpb=8a14a72f573065fc38ed2e4029d2a41d701c3622

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 2ba0a5630f..4f74b9aedc 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,29 +1,66 @@
-INCLUDES = -I$(top_srcdir)/src $(all_includes)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-DPKGDATADIR=\"$(pkgdatadir)\"
+
 METASOURCES = AUTO
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
-noinst_LIBRARIES = libhelper.a
+noinst_LTLIBRARIES = libhelper.la
 
 if ECOSBOARD
-CONFIGFILES = 
+CONFIGFILES =
+else
+CONFIGFILES = options.c jim.c jim-eventloop.c
+endif
+
+
+
+libhelper_la_SOURCES = \
+	binarybuffer.c \
+	$(CONFIGFILES) \
+	configuration.c \
+	log.c \
+	command.c \
+	time_support.c \
+	replacements.c \
+	fileio.c \
+	membuf.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
-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 \
+	types.h \
+	log.h \
+	command.h \
+	membuf.h \
+	time_support.h \
+	replacements.h \
+	fileio.h \
+	jim.h \
+	jim-eventloop.h \
+	system.h \
+	bin2char.c
+
+EXTRA_DIST = startup.tcl
 
-libhelper_a_SOURCES += startup_tcl.c
+BIN2C = bin2char$(EXEEXT_FOR_BUILD)
 
-noinst_PROGRAMS = bin2char
+BUILT_SOURCES = $(BIN2C)
 
-bin2char_SOURCES = bin2char.c
+$(BIN2C): bin2char.c
+	${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
 
-# Convert .tcl to cfile
-startup_tcl.c: bin2char startup.tcl
-	./bin2char startup_tcl < $(srcdir)/startup.tcl > startup_tcl.c
+CLEANFILES = bin2char$(EXEEXT_FOR_BUILD)
 
-# add startup_tcl.c to make clean list
-CLEANFILES = startup_tcl.c
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in