Update autotools scripts to require automake 1.6. The configure.in script

[openocd.git] / src / helper / Makefile.am

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 2ba0a5630fa80b731913bcd6306cd26240c296f3..e0686401e58445e608aebc20a1bc303d75ed0abd 100644 (file)
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,29 +1,45 @@
-INCLUDES = -I$(top_srcdir)/src $(all_includes)
+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
 
 if ECOSBOARD
 CONFIGFILES = 
 else
-CONFIGFILES = options.c jim.c
+CONFIGFILES = options.c jim.c jim-eventloop.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 \
-       jim.h
+       replacements.c fileio.c startup_tcl.c
 
-libhelper_a_SOURCES += startup_tcl.c
+if IOUTIL
+libhelper_a_SOURCES += ioutil.c
+endif
 
-noinst_PROGRAMS = bin2char
+libhelper_a_CFLAGS =
+if IS_MINGW
+# FD_* macros are sloppy with their signs on MinGW32 platform
+libhelper_a_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
 
-bin2char_SOURCES = bin2char.c
+bin2char$(EXEEXT_FOR_BUILD): bin2char.c
+       ${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
 
 # Convert .tcl to cfile
-startup_tcl.c: bin2char startup.tcl
-       ./bin2char startup_tcl < $(srcdir)/startup.tcl > startup_tcl.c
+startup_tcl.c: startup.tcl bin2char$(EXEEXT_FOR_BUILD)
+       ./bin2char$(EXEEXT_FOR_BUILD) startup_tcl < $(srcdir)/startup.tcl > $@
 
 # add startup_tcl.c to make clean list
-CLEANFILES = startup_tcl.c
+CLEANFILES = startup_tcl.c bin2char$(EXEEXT_FOR_BUILD)
+
+MAINTAINERCLEANFILES = Makefile.in