X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=215bbaed5fbe72bc4efe0d7dcb6d59b791f5d835;hb=a74b5687a7195a6d816a251df59af21acf05aae6;hp=4f74b9aedcd0709a8cbb42c255bb20a23723fb9c;hpb=822c06d9e3983b37cd1830c594210973cb560991;p=openocd.git

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 4f74b9aedc..215bbaed5f 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,17 +1,11 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/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_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS)
 
 libhelper_la_SOURCES = \
 	binarybuffer.c \
@@ -22,7 +16,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
@@ -40,17 +35,17 @@ 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