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

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index d81e7d20df..77c61455dc 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,7 +1,11 @@
-INCLUDES = -I$(top_srcdir)/src $(all_includes) -I$(top_srcdir)/src/target
+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 = 
@@ -9,12 +13,26 @@ else
 CONFIGFILES = options.c jim.c jim-eventloop.c 
 endif
 
-libhelper_a_SOURCES = binarybuffer.c $(CONFIGFILES) configuration.c log.c command.c time_support.c \
+
+
+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
+
 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
+	system.h startup.tcl bin2char.c
 
 bin2char$(EXEEXT_FOR_BUILD): bin2char.c
 	${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
@@ -25,3 +43,5 @@ startup_tcl.c: startup.tcl bin2char$(EXEEXT_FOR_BUILD)
 
 # add startup_tcl.c to make clean list
 CLEANFILES = startup_tcl.c bin2char$(EXEEXT_FOR_BUILD)
+
+MAINTAINERCLEANFILES = Makefile.in