X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=6189b63ab1ab69f58d55fde635ed0d370cca288e;hp=244ada7cd80564500d46e7ed04712c1bb4ad4377;hb=39650e2273bcae868d9509fe36515936ce25aacb;hpb=eb1bc657ae10f9e21304e068ca17dc0231a9b9c0

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 244ada7cd8..6189b63ab1 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,18 +1,9 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
-	-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,7 +14,8 @@ libhelper_la_SOURCES = \
 	time_support.c \
 	replacements.c \
 	fileio.c \
-	membuf.c
+	util.c \
+	jim-nvp.c
 
 if IOUTIL
 libhelper_la_SOURCES += ioutil.c
@@ -41,17 +33,16 @@ noinst_HEADERS = \
 	binarybuffer.h \
 	configuration.h \
 	ioutil.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