X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=64caf98b7da817aed83f966bee441fd93cf04773;hb=063253fa89b2d48104b43783c03ff7161c5d1a5a;hp=8a2d472e9057a0ec5d5c752aff9b408b9a90bed2;hpb=69c6f1f7eab96ea47328ece9d71292a71af6ce9c;p=openocd.git

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 8a2d472e90..64caf98b7d 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,15 +1,56 @@
-INCLUDES = -I$(top_srcdir)/src $(all_includes)
+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)
+
+libhelper_la_SOURCES = \
+	binarybuffer.c \
+	$(CONFIGFILES) \
+	configuration.c \
+	log.c \
+	command.c \
+	time_support.c \
+	replacements.c \
+	fileio.c \
+	util.c \
+	jep106.c \
+	jim-nvp.c
 
-if ECOSBOARD
-CONFIGFILES = 
+if IOUTIL
+libhelper_la_SOURCES += ioutil.c
 else
-CONFIGFILES = options.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
+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.sh \
+	jep106.h \
+	jep106.inc \
+	update_jep106.pl \
+	jim-nvp.h
+
+EXTRA_DIST = startup.tcl
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in