X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=25585a4896468309717118949694c1ac6a06bbbe;hb=8eb92c7e99c018c1cb48be76b0c9736b6c64cba9;hp=3ec4f31a0672ca0ae6a7f7c3e7fba48db33e6267;hpb=c8b8a34bb5e98660c4ce3683fb64af31b494d55c;p=openocd

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 3ec4f31a..25585a48 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,7 @@ libhelper_la_SOURCES = \
 	time_support.c \
 	replacements.c \
 	fileio.c \
-	membuf.c
+	util.c
 
 if IOUTIL
 libhelper_la_SOURCES += ioutil.c
@@ -41,15 +38,13 @@ 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