Add a bit-level transfer queue

[openocd] / src / helper / Makefile.am

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 2ba0a5630fa80b731913bcd6306cd26240c296f3..9e27d051ef7d38a861fcd021c1f966903ac07e2c 100644 (file)
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,29 +1,59 @@
-INCLUDES = -I$(top_srcdir)/src $(all_includes)
+include $(top_srcdir)/common.mk
+
 METASOURCES = AUTO
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
-noinst_LIBRARIES = libhelper.a
+noinst_LTLIBRARIES = libhelper.la
+
+CONFIGFILES = options.c time_support_common.c
+
+libhelper_la_SOURCES = \
+       binarybuffer.c \
+       $(CONFIGFILES) \
+       configuration.c \
+       log.c \
+       command.c \
+       time_support.c \
+       replacements.c \
+       fileio.c \
+       util.c \
+       jim-nvp.c
 
-if ECOSBOARD
-CONFIGFILES = 
+if IOUTIL
+libhelper_la_SOURCES += ioutil.c
 else
-CONFIGFILES = options.c jim.c
+libhelper_la_SOURCES += ioutil_stubs.c
 endif
 
-libhelper_a_SOURCES = binarybuffer.c $(CONFIGFILES) configuration.c log.c command.c time_support.c \
-       replacements.c fileio.c
-noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
-       time_support.h replacements.h fileio.h \
-       jim.h
+libhelper_la_CFLAGS =
+if IS_MINGW
+# FD_* macros are sloppy with their signs on MinGW32 platform
+libhelper_la_CFLAGS += -Wno-sign-compare
+endif
+
+noinst_HEADERS = \
+       binarybuffer.h \
+       configuration.h \
+       ioutil.h \
+       list.h \
+       util.h \
+       types.h \
+       log.h \
+       command.h \
+       time_support.h \
+       replacements.h \
+       fileio.h \
+       system.h \
+       bin2char.c \
+       jim-nvp.h
+
+EXTRA_DIST = startup.tcl
 
-libhelper_a_SOURCES += startup_tcl.c
+BIN2C = bin2char$(EXEEXT_FOR_BUILD)
 
-noinst_PROGRAMS = bin2char
+BUILT_SOURCES = $(BIN2C)
 
-bin2char_SOURCES = bin2char.c
+$(BIN2C): bin2char.c
+       ${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
 
-# Convert .tcl to cfile
-startup_tcl.c: bin2char startup.tcl
-       ./bin2char startup_tcl < $(srcdir)/startup.tcl > startup_tcl.c
+CLEANFILES = bin2char$(EXEEXT_FOR_BUILD)
 
-# add startup_tcl.c to make clean list
-CLEANFILES = startup_tcl.c
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in