From a5821dcadc9824cb837259cf8a3e3f6e108603a0 Mon Sep 17 00:00:00 2001 From: Roland Jax Date: Sun, 7 Dec 2014 12:13:35 +0100 Subject: [PATCH] cleanup after merge of pull request #18. --- .gitignore | 6 +----- src/ebusd/Makefile.am | 3 ++- src/tools/ebusfeed.cpp | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index aec1d546..1edd1881 100644 --- a/.gitignore +++ b/.gitignore @@ -16,14 +16,10 @@ Makefile.in /src/tools/ebusfeed /src/lib/utils/libutils.a /src/lib/ebus/libebus.a -/src/lib/ebus/test/test_bus /src/lib/ebus/test/test_port -/src/lib/ebus/test/test_configfile -/src/lib/ebus/test/test_commands -/src/lib/ebus/test/test_decode -/src/lib/ebus/test/test_encode /src/lib/ebus/test/test_symbol /src/lib/ebus/test/test_data +/src/lib/ebus/test/test_message /docs/Doxyfile /docs/doxyfile.stamp /docs/html diff --git a/src/ebusd/Makefile.am b/src/ebusd/Makefile.am index 5d060fb6..e4d02e6f 100644 --- a/src/ebusd/Makefile.am +++ b/src/ebusd/Makefile.am @@ -16,7 +16,8 @@ ebusd_SOURCES = bushandler.cpp \ ebusd_LDADD = $(top_srcdir)/src/lib/utils/libutils.a \ $(top_srcdir)/src/lib/ebus/libebus.a \ - -lpthread -lrt + -lpthread + -lrt distclean-local: -rm -f Makefile.in diff --git a/src/tools/ebusfeed.cpp b/src/tools/ebusfeed.cpp index 776ae141..d4330e5d 100644 --- a/src/tools/ebusfeed.cpp +++ b/src/tools/ebusfeed.cpp @@ -68,7 +68,7 @@ int main(int argc, char* argv[]) } string dev(A.getOptVal("device")); - Port port(dev, true); + Port port(dev, true, false, NULL, false, "", 1); port.open(); if(port.isOpen() == true) {