X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=22b3c330e8ce5492ee02e71003691951f94f1822;hb=df22f0f9ca4ebf881adf8d20cb63e64139f18613;hp=e518bc7f218963f33d043199838c48a2954dca2d;hpb=0313c595555ae1c391766d1594735042ccd20443;p=openocd.git

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index e518bc7f21..22b3c330e8 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,15 +1,64 @@
-INCLUDES = $(all_includes)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/server \
+	-I$(top_srcdir)/src/target \
+	-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
+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
+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 interpreter.c command.c time_support.c \
-	replacements.c fileio.c
-noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
-	interpreter.h time_support.h replacements.h fileio.h
+noinst_HEADERS = \
+	binarybuffer.h \
+	configuration.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
+
+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