X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=c9479b43edb18aba62a6f098f952e75d63059262;hp=cca5ac3503636a9ffccac33a021fcb2b1a2a4bd6;hb=ef885d3b2a3001325f525df250dadd570e5d743e;hpb=630fc86ee339aa400f58fe80cbc5a1926eb3ef39

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index cca5ac3503..c9479b43ed 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,7 +1,4 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
-	-DPKGDATADIR=\"$(pkgdatadir)\"
+include $(top_srcdir)/common.mk
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libhelper.la
@@ -9,7 +6,7 @@ noinst_LTLIBRARIES = libhelper.la
 if ECOSBOARD
 CONFIGFILES = time_support_ecos.c
 else
-CONFIGFILES = options.c jim.c jim-eventloop.c time_support_common.c
+CONFIGFILES = options.c time_support_common.c
 endif
 
 
@@ -23,7 +20,8 @@ libhelper_la_SOURCES = \
 	time_support.c \
 	replacements.c \
 	fileio.c \
-	util.c
+	util.c \
+	jim-nvp.c
 
 if IOUTIL
 libhelper_la_SOURCES += ioutil.c
@@ -48,10 +46,9 @@ noinst_HEADERS = \
 	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