X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=64caf98b7da817aed83f966bee441fd93cf04773;hb=baf08b0a1ad656434583e3c102a350d4cf885bf9;hp=757eb2e1b4b0ffa5acab6c2aeb122775aeeb7aeb;hpb=176b5600ed2a9a2653ec2b078dc417d3e8955a8e;p=openocd.git

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 757eb2e1b4..64caf98b7d 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,18 +1,11 @@
-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_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS)
 
 libhelper_la_SOURCES = \
 	binarybuffer.c \
@@ -23,11 +16,14 @@ libhelper_la_SOURCES = \
 	time_support.c \
 	replacements.c \
 	fileio.c \
-	membuf.c \
-	startup_tcl.c
+	util.c \
+	jep106.c \
+	jim-nvp.c
 
 if IOUTIL
 libhelper_la_SOURCES += ioutil.c
+else
+libhelper_la_SOURCES += ioutil_stubs.c
 endif
 
 libhelper_la_CFLAGS =
@@ -39,27 +35,22 @@ 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 \
-	startup.tcl \
-	bin2char.c
-
-bin2char$(EXEEXT_FOR_BUILD): bin2char.c
-	${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
-
-# Convert .tcl to cfile
-startup_tcl.c: startup.tcl bin2char$(EXEEXT_FOR_BUILD)
-	./bin2char$(EXEEXT_FOR_BUILD) startup_tcl < $(srcdir)/startup.tcl > $@
+	bin2char.sh \
+	jep106.h \
+	jep106.inc \
+	update_jep106.pl \
+	jim-nvp.h
 
-# add startup_tcl.c to make clean list
-CLEANFILES = startup_tcl.c bin2char$(EXEEXT_FOR_BUILD)
+EXTRA_DIST = startup.tcl
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in