X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=9477267f6cfa550a2ed2bff8f18af8ec7d14d0db;hb=5b38f862f8be08cb7163bfe7fe101e4086752fbd;hp=d81e7d20dfe4335b88d62753fa300d891b7138a7;hpb=b1cf5423efc88b2a78788db22df41df1b6edc59a;p=fw%2Fopenocd

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index d81e7d20d..9477267f6 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,27 +1,52 @@
-INCLUDES = -I$(top_srcdir)/src $(all_includes) -I$(top_srcdir)/src/target
+include $(top_srcdir)/common.mk
+
 METASOURCES = AUTO
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
-noinst_LIBRARIES = libhelper.a
+noinst_LTLIBRARIES = libhelper.la
+
+CONFIGFILES = options.c time_support_common.c
+
+libhelper_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS)
 
-if ECOSBOARD
-CONFIGFILES = 
+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
-CONFIGFILES = options.c jim.c jim-eventloop.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 startup_tcl.c
-
-noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
-	time_support.h replacements.h fileio.h jim.h jim-eventloop.h \
-	startup.tcl bin2char.c
+libhelper_la_CFLAGS =
+if IS_MINGW
+# FD_* macros are sloppy with their signs on MinGW32 platform
+libhelper_la_CFLAGS += -Wno-sign-compare
+endif
 
-bin2char$(EXEEXT_FOR_BUILD): bin2char.c
-	${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
+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.sh \
+	jim-nvp.h
 
-# Convert .tcl to cfile
-startup_tcl.c: startup.tcl bin2char$(EXEEXT_FOR_BUILD)
-	./bin2char$(EXEEXT_FOR_BUILD) startup_tcl < $(srcdir)/startup.tcl > $@
+EXTRA_DIST = startup.tcl
 
-# add startup_tcl.c to make clean list
-CLEANFILES = startup_tcl.c bin2char$(EXEEXT_FOR_BUILD)
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in