X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2FMakefile.am;h=0d886843ce7f69779711d86372e71195864a6013;hp=01e805eb05a21e1950653d32daa0cb517a4903ad;hb=b3a51bbb590cca6d6536532d8c0965748410f277;hpb=eaf10f69de969652d03742809b9c970158b90719

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 01e805eb05..0d886843ce 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,67 +1,42 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/server \
-	-I$(top_srcdir)/src/target \
-	-DPKGDATADIR=\"$(pkgdatadir)\"
-
-METASOURCES = AUTO
-noinst_LTLIBRARIES = libhelper.la
-
-if ECOSBOARD
-CONFIGFILES =
-else
-CONFIGFILES = options.c jim.c jim-eventloop.c
-endif
-
-
-
-libhelper_la_SOURCES = \
-	binarybuffer.c \
-	$(CONFIGFILES) \
-	configuration.c \
-	log.c \
-	command.c \
-	time_support.c \
-	replacements.c \
-	fileio.c \
-	membuf.c
-
-if IOUTIL
-libhelper_la_SOURCES += ioutil.c
-else
-libhelper_la_SOURCES += ioutil_stubs.c
-endif
-
-libhelper_la_CFLAGS =
+noinst_LTLIBRARIES += %D%/libhelper.la
+
+%C%_libhelper_la_SOURCES = \
+	%D%/binarybuffer.c \
+	%D%/options.c \
+	%D%/time_support_common.c \
+	%D%/configuration.c \
+	%D%/log.c \
+	%D%/command.c \
+	%D%/time_support.c \
+	%D%/replacements.c \
+	%D%/fileio.c \
+	%D%/util.c \
+	%D%/jep106.c \
+	%D%/jim-nvp.c \
+	%D%/align.h \
+	%D%/binarybuffer.h \
+	%D%/bits.h \
+	%D%/configuration.h \
+	%D%/list.h \
+	%D%/util.h \
+	%D%/types.h \
+	%D%/log.h \
+	%D%/command.h \
+	%D%/time_support.h \
+	%D%/replacements.h \
+	%D%/fileio.h \
+	%D%/system.h \
+	%D%/jep106.h \
+	%D%/jep106.inc \
+	%D%/jim-nvp.h
+
+%C%_libhelper_la_CFLAGS = $(AM_CFLAGS)
 if IS_MINGW
 # FD_* macros are sloppy with their signs on MinGW32 platform
-libhelper_la_CFLAGS += -Wno-sign-compare
+%C%_libhelper_la_CFLAGS += -Wno-sign-compare
 endif
 
-noinst_HEADERS = \
-	binarybuffer.h \
-	configuration.h \
-	ioutil.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
-
-EXTRA_DIST = startup.tcl
-
-BIN2C = bin2char$(EXEEXT_FOR_BUILD)
-
-BUILT_SOURCES = $(BIN2C)
-
-$(BIN2C): bin2char.c
-	${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
-
-CLEANFILES = bin2char$(EXEEXT_FOR_BUILD)
-
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+STARTUP_TCL_SRCS += %D%/startup.tcl
+EXTRA_DIST += \
+	%D%/bin2char.sh \
+	%D%/update_jep106.pl