log: remove hack to redirect logs when pipes are in use

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

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 67250a18d288aab5aac0108f7576336be82f6c3f..cca5ac3503636a9ffccac33a021fcb2b1a2a4bd6 100644 (file)
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,15 +1,15 @@
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/server \
-       -I$(top_srcdir)/src/target \
+       -I$(top_srcdir)/src \
+       -I$(top_builddir)/src \
        -DPKGDATADIR=\"$(pkgdatadir)\"
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libhelper.la
 
 if ECOSBOARD
-CONFIGFILES =
+CONFIGFILES = time_support_ecos.c
 else
-CONFIGFILES = options.c jim.c jim-eventloop.c
+CONFIGFILES = options.c jim.c jim-eventloop.c time_support_common.c
 endif
 
 
@@ -23,11 +23,12 @@ libhelper_la_SOURCES = \
        time_support.c \
        replacements.c \
        fileio.c \
-       membuf.c \
-       startup_tcl.c
+       util.c
 
 if IOUTIL
 libhelper_la_SOURCES += ioutil.c
+else
+libhelper_la_SOURCES += ioutil_stubs.c
 endif
 
 libhelper_la_CFLAGS =
@@ -39,19 +40,21 @@ endif
 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 \
-       startup.tcl \
        bin2char.c
 
+EXTRA_DIST = startup.tcl
+
 BIN2C = bin2char$(EXEEXT_FOR_BUILD)
 
 BUILT_SOURCES = $(BIN2C)
@@ -59,11 +62,6 @@ BUILT_SOURCES = $(BIN2C)
 $(BIN2C): bin2char.c
        ${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
 
-# Convert .tcl to cfile
-startup_tcl.c: startup.tcl $(BIN2C)
-       ./$(BIN2C) startup_tcl < $(srcdir)/startup.tcl > $@
-
-# add startup_tcl.c to make clean list
-CLEANFILES = startup_tcl.c bin2char$(EXEEXT_FOR_BUILD)
+CLEANFILES = bin2char$(EXEEXT_FOR_BUILD)
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in