X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=77c61455dc310edc782af06586d1c4881ecde813;hb=af7cdfd82bf47fde9c183c3ff5d14422fc737f24;hp=1f3d76b6ec76d35d14fdd645daeffd1c702b1dc7;hpb=c5b718f5e85c7a884f7610fea46ceea2c3fbd4a7;p=openocd.git

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 1f3d76b6ec..77c61455dc 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,15 +1,47 @@
-INCLUDES = $(all_includes)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/server \
+	-I$(top_srcdir)/src/target \
+	-DPKGDATADIR=\"$(pkgdatadir)\" \
+	-DPKGLIBDIR=\"$(pkglibdir)\"
+
 METASOURCES = AUTO
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
-noinst_LIBRARIES = libhelper.a
+noinst_LTLIBRARIES = libhelper.la
 
 if ECOSBOARD
 CONFIGFILES = 
 else
-CONFIGFILES = options.c
+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 startup_tcl.c
+
+if IOUTIL
+libhelper_la_SOURCES += ioutil.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
 
-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
+	time_support.h replacements.h fileio.h jim.h jim-eventloop.h \
+	system.h startup.tcl bin2char.c
+
+bin2char$(EXEEXT_FOR_BUILD): bin2char.c
+	${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
+
+# Convert .tcl to cfile
+startup_tcl.c: startup.tcl bin2char$(EXEEXT_FOR_BUILD)
+	./bin2char$(EXEEXT_FOR_BUILD) startup_tcl < $(srcdir)/startup.tcl > $@
+
+# add startup_tcl.c to make clean list
+CLEANFILES = startup_tcl.c bin2char$(EXEEXT_FOR_BUILD)
+
+MAINTAINERCLEANFILES = Makefile.in