X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=215bbaed5fbe72bc4efe0d7dcb6d59b791f5d835;hp=93df6058147ccc47af0e5c2239647cb503b626e1;hb=191a5736c202dfb784e86a8190edc64e80dc62e5;hpb=00228aa8398fd7dde1271af424fab1cb470c5f43

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 93df605814..215bbaed5f 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,18 +1,11 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/server \
-	-I$(top_srcdir)/src/target \
-	-DPKGDATADIR=\"$(pkgdatadir)\"
+include $(top_srcdir)/common.mk
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libhelper.la
 
-if ECOSBOARD
-CONFIGFILES = 
-else
-CONFIGFILES = options.c jim.c jim-eventloop.c 
-endif
-
+CONFIGFILES = options.c time_support_common.c
 
+libhelper_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS)
 
 libhelper_la_SOURCES = \
 	binarybuffer.c \
@@ -23,10 +16,13 @@ libhelper_la_SOURCES = \
 	time_support.c \
 	replacements.c \
 	fileio.c \
-	startup_tcl.c
+	util.c \
+	jim-nvp.c
 
 if IOUTIL
 libhelper_la_SOURCES += ioutil.c
+else
+libhelper_la_SOURCES += ioutil_stubs.c
 endif
 
 libhelper_la_CFLAGS =
@@ -38,26 +34,28 @@ 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 \
-	jim.h \
-	jim-eventloop.h \
 	system.h \
-	startup.tcl \
-	bin2char.c
+	bin2char.c \
+	jim-nvp.h
 
-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