X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=9e27d051ef7d38a861fcd021c1f966903ac07e2c;hb=6f65045b3791525e99d09d07b5f9d8dd5aa511e5;hp=91fe01b665a048e72d8a2702ad50b5c49b7ab608;hpb=9e5a6679cac36667e51f24a6bd5670396cd06ed6;p=fw%2Fopenocd

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 91fe01b66..9e27d051e 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,8 +1,59 @@
-INCLUDES = $(all_includes)
+include $(top_srcdir)/common.mk
+
 METASOURCES = AUTO
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
-noinst_LIBRARIES = libhelper.a
-libhelper_a_SOURCES = binarybuffer.c configuration.c options.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_LTLIBRARIES = libhelper.la
+
+CONFIGFILES = options.c time_support_common.c
+
+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 \
+	list.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