X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fhelper%2FMakefile.am;h=3ec4f31a0672ca0ae6a7f7c3e7fba48db33e6267;hb=c8b8a34bb5e98660c4ce3683fb64af31b494d55c;hp=7047253b24c633d406dcf97321999d7088c9733f;hpb=86a7d813a165fda2816b8152342219b6c4ae2fc4;p=openocd.git

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 7047253b24..3ec4f31a06 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,15 +1,15 @@
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/server \
-	-I$(top_srcdir)/src/target \
+	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src \
 	-DPKGDATADIR=\"$(pkgdatadir)\"
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libhelper.la
 
 if ECOSBOARD
-CONFIGFILES =
+CONFIGFILES = time_support_ecos.c
 else
-CONFIGFILES = options.c jim.c jim-eventloop.c
+CONFIGFILES = options.c jim.c jim-eventloop.c time_support_common.c
 endif
 
 
@@ -23,11 +23,12 @@ libhelper_la_SOURCES = \
 	time_support.c \
 	replacements.c \
 	fileio.c \
-	membuf.c \
-	startup_tcl.c
+	membuf.c
 
 if IOUTIL
 libhelper_la_SOURCES += ioutil.c
+else
+libhelper_la_SOURCES += ioutil_stubs.c
 endif
 
 libhelper_la_CFLAGS =
@@ -39,6 +40,7 @@ endif
 noinst_HEADERS = \
 	binarybuffer.h \
 	configuration.h \
+	ioutil.h \
 	types.h \
 	log.h \
 	command.h \
@@ -49,17 +51,17 @@ noinst_HEADERS = \
 	jim.h \
 	jim-eventloop.h \
 	system.h \
-	startup.tcl \
 	bin2char.c
 
-bin2char$(EXEEXT_FOR_BUILD): bin2char.c
-	${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
+EXTRA_DIST = startup.tcl
+
+BIN2C = bin2char$(EXEEXT_FOR_BUILD)
 
-# Convert .tcl to cfile
-startup_tcl.c: startup.tcl bin2char$(EXEEXT_FOR_BUILD)
-	./bin2char$(EXEEXT_FOR_BUILD) startup_tcl < $(srcdir)/startup.tcl > $@
+BUILT_SOURCES = $(BIN2C)
+
+$(BIN2C): bin2char.c
+	${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
 
-# add startup_tcl.c to make clean list
-CLEANFILES = startup_tcl.c bin2char$(EXEEXT_FOR_BUILD)
+CLEANFILES = bin2char$(EXEEXT_FOR_BUILD)
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in