X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=9e27d051ef7d38a861fcd021c1f966903ac07e2c;hp=9557f5b2133f9836fbe4160e3b574ed3dc947a8e;hb=10df176b0fb932d61f0dc5d6bfd0a0942501fc40;hpb=903daa796a226152fe56245758c8388b79d12988

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 9557f5b213..9e27d051ef 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,18 +1,9 @@
-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_SOURCES = \
 	binarybuffer.c \
@@ -23,10 +14,13 @@ libhelper_la_SOURCES = \
 	time_support.c \
 	replacements.c \
 	fileio.c \
-	membuf.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,17 +32,20 @@ endif
 noinst_HEADERS = \
 	binarybuffer.h \
 	configuration.h \
+	ioutil.h \
+	list.h \
+	util.h \
 	types.h \
 	log.h \
 	command.h \
-	membuf.h \
 	time_support.h \
 	replacements.h \
 	fileio.h \
-	jim.h \
-	jim-eventloop.h \
 	system.h \
-	bin2char.c
+	bin2char.c \
+	jim-nvp.h
+
+EXTRA_DIST = startup.tcl
 
 BIN2C = bin2char$(EXEEXT_FOR_BUILD)