jimtcl: restrict memory leak workaround on Linux only

[fw/openocd] / src / helper / Makefile.am

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 0cfdf7c311a7af2307525b9b8a3401001e431b83..bedc9f707e608ad1c6d16c4d0768ddc75650cfa1 100644 (file)
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,36 +1,43 @@
-INCLUDES = -I$(top_srcdir)/src $(all_includes) -I$(top_srcdir)/src/target -I$(top_srcdir)/src/server
-METASOURCES = AUTO
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
-noinst_LIBRARIES = libhelper.a
-
-if ECOSBOARD
-CONFIGFILES = 
-else
-CONFIGFILES = options.c jim.c jim-eventloop.c 
-endif
-
-
-
-libhelper_a_SOURCES = binarybuffer.c $(CONFIGFILES) configuration.c log.c command.c time_support.c \
-       replacements.c fileio.c startup_tcl.c
-
-if IOUTIL
-libhelper_a_SOURCES += ioutil.c
+noinst_LTLIBRARIES += %D%/libhelper.la
+
+%C%_libhelper_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS)
+
+%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%/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
+%C%_libhelper_la_CFLAGS += -Wno-sign-compare
 endif
 
-
-noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
-       time_support.h replacements.h fileio.h jim.h jim-eventloop.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 > $@
-
-# add startup_tcl.c to make clean list
-CLEANFILES = startup_tcl.c bin2char$(EXEEXT_FOR_BUILD)
-
-MAINTAINERCLEANFILES = Makefile.in
+STARTUP_TCL_SRCS += %D%/startup.tcl
+EXTRA_DIST += \
+       %D%/bin2char.sh \
+       %D%/update_jep106.pl