-INCLUDES = $(all_includes)\r
-METASOURCES = AUTO\r
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@\r
-noinst_LIBRARIES = libhelper.a\r
-libhelper_a_SOURCES = binarybuffer.c configuration.c options.c log.c interpreter.c command.c time_support.c \\r
- replacements.c fileio.c\r
-noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \\r
- interpreter.h time_support.h replacements.h fileio.h\r
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/server \
+ -I$(top_srcdir)/src/target \
+ -DPKGDATADIR=\"$(pkgdatadir)\" \
+ -DPKGLIBDIR=\"$(pkglibdir)\"
+
+METASOURCES = AUTO
+noinst_LIBRARIES = libhelper.a
+
+if ECOSBOARD
+CONFIGFILES =
+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 \
+ replacements.c fileio.c startup_tcl.c
+
+if IOUTIL
+libhelper_a_SOURCES += ioutil.c
+endif
+
+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$(EXEEXT_FOR_BUILD): bin2char.c
+ ${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
+
+# Convert .tcl to cfile
+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 bin2char$(EXEEXT_FOR_BUILD)
+
+MAINTAINERCLEANFILES = Makefile.in