From 793c64d9226b79596377fb4345a28f5625858440 Mon Sep 17 00:00:00 2001 From: Roland Jax Date: Thu, 6 Nov 2014 16:08:11 +0100 Subject: [PATCH] file struturce changed. --- .gitignore | 22 ++++++++++----------- Makefile.am | 2 +- configure.ac | 8 ++++---- src/ebusctl/Makefile.am | 17 ++++++++++++++++ src/{tools => ebusctl}/ebusctl.cpp | 0 src/ebusd/Makefile.am | 8 ++++---- src/{libebus => lib/ebus}/Makefile.am | 0 src/{libebus => lib/ebus}/bus.cpp | 0 src/{libebus => lib/ebus}/bus.h | 0 src/{libebus => lib/ebus}/buscommand.cpp | 0 src/{libebus => lib/ebus}/buscommand.h | 0 src/{libebus => lib/ebus}/command.cpp | 0 src/{libebus => lib/ebus}/command.h | 0 src/{libebus => lib/ebus}/commands.cpp | 0 src/{libebus => lib/ebus}/commands.h | 0 src/{libebus => lib/ebus}/configfile.cpp | 0 src/{libebus => lib/ebus}/configfile.h | 0 src/{libebus => lib/ebus}/data.cpp | 0 src/{libebus => lib/ebus}/data.h | 0 src/{libebus => lib/ebus}/decode.cpp | 0 src/{libebus => lib/ebus}/decode.h | 0 src/{libebus => lib/ebus}/dump.cpp | 0 src/{libebus => lib/ebus}/dump.h | 0 src/{libebus => lib/ebus}/encode.cpp | 0 src/{libebus => lib/ebus}/encode.h | 0 src/{libebus => lib/ebus}/port.cpp | 0 src/{libebus => lib/ebus}/port.h | 0 src/{libebus => lib/ebus}/result.cpp | 0 src/{libebus => lib/ebus}/result.h | 0 src/{libebus => lib/ebus}/symbol.cpp | 0 src/{libebus => lib/ebus}/symbol.h | 0 src/{ => lib/ebus}/test/Makefile.am | 18 ++++++++--------- src/{ => lib/ebus}/test/command.csv | 0 src/{ => lib/ebus}/test/test_bus.cpp | 0 src/{ => lib/ebus}/test/test_commands.cpp | 0 src/{ => lib/ebus}/test/test_configfile.cpp | 0 src/{ => lib/ebus}/test/test_data.cpp | 0 src/{ => lib/ebus}/test/test_decode.cpp | 0 src/{ => lib/ebus}/test/test_encode.cpp | 0 src/{ => lib/ebus}/test/test_port.cpp | 0 src/{ => lib/ebus}/test/test_symbol.cpp | 0 src/lib/utils/Makefile.am | 21 ++++++++++++++++++++ src/{libcore => lib/utils}/appl.cpp | 0 src/{libcore => lib/utils}/appl.h | 0 src/{libcore => lib/utils}/daemon.cpp | 0 src/{libcore => lib/utils}/daemon.h | 0 src/{libcore => lib/utils}/logger.cpp | 0 src/{libcore => lib/utils}/logger.h | 0 src/{libcore => lib/utils}/notify.h | 0 src/{libcore => lib/utils}/tcpsocket.cpp | 0 src/{libcore => lib/utils}/tcpsocket.h | 0 src/{libcore => lib/utils}/thread.cpp | 0 src/{libcore => lib/utils}/thread.h | 0 src/{libcore => lib/utils}/wqueue.h | 0 src/libcore/Makefile.am | 21 -------------------- src/tools/Makefile.am | 17 ---------------- 56 files changed, 67 insertions(+), 67 deletions(-) create mode 100644 src/ebusctl/Makefile.am rename src/{tools => ebusctl}/ebusctl.cpp (100%) rename src/{libebus => lib/ebus}/Makefile.am (100%) rename src/{libebus => lib/ebus}/bus.cpp (100%) rename src/{libebus => lib/ebus}/bus.h (100%) rename src/{libebus => lib/ebus}/buscommand.cpp (100%) rename src/{libebus => lib/ebus}/buscommand.h (100%) rename src/{libebus => lib/ebus}/command.cpp (100%) rename src/{libebus => lib/ebus}/command.h (100%) rename src/{libebus => lib/ebus}/commands.cpp (100%) rename src/{libebus => lib/ebus}/commands.h (100%) rename src/{libebus => lib/ebus}/configfile.cpp (100%) rename src/{libebus => lib/ebus}/configfile.h (100%) rename src/{libebus => lib/ebus}/data.cpp (100%) rename src/{libebus => lib/ebus}/data.h (100%) rename src/{libebus => lib/ebus}/decode.cpp (100%) rename src/{libebus => lib/ebus}/decode.h (100%) rename src/{libebus => lib/ebus}/dump.cpp (100%) rename src/{libebus => lib/ebus}/dump.h (100%) rename src/{libebus => lib/ebus}/encode.cpp (100%) rename src/{libebus => lib/ebus}/encode.h (100%) rename src/{libebus => lib/ebus}/port.cpp (100%) rename src/{libebus => lib/ebus}/port.h (100%) rename src/{libebus => lib/ebus}/result.cpp (100%) rename src/{libebus => lib/ebus}/result.h (100%) rename src/{libebus => lib/ebus}/symbol.cpp (100%) rename src/{libebus => lib/ebus}/symbol.h (100%) rename src/{ => lib/ebus}/test/Makefile.am (53%) rename src/{ => lib/ebus}/test/command.csv (100%) rename src/{ => lib/ebus}/test/test_bus.cpp (100%) rename src/{ => lib/ebus}/test/test_commands.cpp (100%) rename src/{ => lib/ebus}/test/test_configfile.cpp (100%) rename src/{ => lib/ebus}/test/test_data.cpp (100%) rename src/{ => lib/ebus}/test/test_decode.cpp (100%) rename src/{ => lib/ebus}/test/test_encode.cpp (100%) rename src/{ => lib/ebus}/test/test_port.cpp (100%) rename src/{ => lib/ebus}/test/test_symbol.cpp (100%) create mode 100644 src/lib/utils/Makefile.am rename src/{libcore => lib/utils}/appl.cpp (100%) rename src/{libcore => lib/utils}/appl.h (100%) rename src/{libcore => lib/utils}/daemon.cpp (100%) rename src/{libcore => lib/utils}/daemon.h (100%) rename src/{libcore => lib/utils}/logger.cpp (100%) rename src/{libcore => lib/utils}/logger.h (100%) rename src/{libcore => lib/utils}/notify.h (100%) rename src/{libcore => lib/utils}/tcpsocket.cpp (100%) rename src/{libcore => lib/utils}/tcpsocket.h (100%) rename src/{libcore => lib/utils}/thread.cpp (100%) rename src/{libcore => lib/utils}/thread.h (100%) rename src/{libcore => lib/utils}/wqueue.h (100%) delete mode 100644 src/libcore/Makefile.am delete mode 100644 src/tools/Makefile.am diff --git a/.gitignore b/.gitignore index ef3fe657..69207eca 100644 --- a/.gitignore +++ b/.gitignore @@ -11,15 +11,15 @@ Makefile.in .deps/ *.o *.dirstamp -/src/libcore/libcore.a -/src/libebus/libebus.a /src/ebusd/ebusd -/src/tools/ebusctl -/src/test/test_bus -/src/test/test_port -/src/test/test_configfile -/src/test/test_commands -/src/test/test_decode -/src/test/test_encode -/src/test/test_symbol -/src/test/test_data +/src/ebusctl/ebusctl +/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 diff --git a/Makefile.am b/Makefile.am index 7146e27c..2bf1f2d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src/libebus src/test src/libcore src/ebusd src/tools +SUBDIRS = src/lib/ebus src/lib/ebus/test src/lib/utils src/ebusd src/ebusctl distclean-local: -rm -rf autom4te.cache diff --git a/configure.ac b/configure.ac index 91356aaa..37d4ab21 100644 --- a/configure.ac +++ b/configure.ac @@ -7,11 +7,11 @@ AC_CONFIG_AUX_DIR([build]) AC_CONFIG_SRCDIR([src/ebusd/main.cpp]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile - src/libebus/Makefile - src/test/Makefile - src/libcore/Makefile + src/lib/ebus/Makefile + src/lib/ebus/test/Makefile + src/lib/utils/Makefile src/ebusd/Makefile - src/tools/Makefile]) + src/ebusctl/Makefile]) AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign]) diff --git a/src/ebusctl/Makefile.am b/src/ebusctl/Makefile.am new file mode 100644 index 00000000..5b5088ce --- /dev/null +++ b/src/ebusctl/Makefile.am @@ -0,0 +1,17 @@ +AM_CXXFLAGS = -fpic \ + -Wall \ + -Wextra \ + -I$(top_srcdir)/src/lib/utils \ + -I$(top_srcdir)/src/lib/ebus + +bin_PROGRAMS = ebusctl + +ebusctl_SOURCES = ebusctl.cpp + +ebusctl_LDADD = $(top_srcdir)/src/lib/utils/libutils.a \ + $(top_srcdir)/src/lib/ebus/libebus.a + +distclean-local: + -rm -f Makefile.in + -rm -rf .libs + diff --git a/src/tools/ebusctl.cpp b/src/ebusctl/ebusctl.cpp similarity index 100% rename from src/tools/ebusctl.cpp rename to src/ebusctl/ebusctl.cpp diff --git a/src/ebusd/Makefile.am b/src/ebusd/Makefile.am index a0990baf..742edf10 100644 --- a/src/ebusd/Makefile.am +++ b/src/ebusd/Makefile.am @@ -1,8 +1,8 @@ AM_CXXFLAGS = -fpic \ -Wall \ -Wextra \ - -I$(top_srcdir)/src/libcore \ - -I$(top_srcdir)/src/libebus + -I$(top_srcdir)/src/lib/utils \ + -I$(top_srcdir)/src/lib/ebus bin_PROGRAMS = ebusd @@ -17,8 +17,8 @@ ebusd_SOURCES = message.h \ baseloop.h \ main.cpp -ebusd_LDADD = $(top_srcdir)/src/libcore/libcore.a \ - $(top_srcdir)/src/libebus/libebus.a \ +ebusd_LDADD = $(top_srcdir)/src/lib/utils/libutils.a \ + $(top_srcdir)/src/lib/ebus/libebus.a \ -lpthread distclean-local: diff --git a/src/libebus/Makefile.am b/src/lib/ebus/Makefile.am similarity index 100% rename from src/libebus/Makefile.am rename to src/lib/ebus/Makefile.am diff --git a/src/libebus/bus.cpp b/src/lib/ebus/bus.cpp similarity index 100% rename from src/libebus/bus.cpp rename to src/lib/ebus/bus.cpp diff --git a/src/libebus/bus.h b/src/lib/ebus/bus.h similarity index 100% rename from src/libebus/bus.h rename to src/lib/ebus/bus.h diff --git a/src/libebus/buscommand.cpp b/src/lib/ebus/buscommand.cpp similarity index 100% rename from src/libebus/buscommand.cpp rename to src/lib/ebus/buscommand.cpp diff --git a/src/libebus/buscommand.h b/src/lib/ebus/buscommand.h similarity index 100% rename from src/libebus/buscommand.h rename to src/lib/ebus/buscommand.h diff --git a/src/libebus/command.cpp b/src/lib/ebus/command.cpp similarity index 100% rename from src/libebus/command.cpp rename to src/lib/ebus/command.cpp diff --git a/src/libebus/command.h b/src/lib/ebus/command.h similarity index 100% rename from src/libebus/command.h rename to src/lib/ebus/command.h diff --git a/src/libebus/commands.cpp b/src/lib/ebus/commands.cpp similarity index 100% rename from src/libebus/commands.cpp rename to src/lib/ebus/commands.cpp diff --git a/src/libebus/commands.h b/src/lib/ebus/commands.h similarity index 100% rename from src/libebus/commands.h rename to src/lib/ebus/commands.h diff --git a/src/libebus/configfile.cpp b/src/lib/ebus/configfile.cpp similarity index 100% rename from src/libebus/configfile.cpp rename to src/lib/ebus/configfile.cpp diff --git a/src/libebus/configfile.h b/src/lib/ebus/configfile.h similarity index 100% rename from src/libebus/configfile.h rename to src/lib/ebus/configfile.h diff --git a/src/libebus/data.cpp b/src/lib/ebus/data.cpp similarity index 100% rename from src/libebus/data.cpp rename to src/lib/ebus/data.cpp diff --git a/src/libebus/data.h b/src/lib/ebus/data.h similarity index 100% rename from src/libebus/data.h rename to src/lib/ebus/data.h diff --git a/src/libebus/decode.cpp b/src/lib/ebus/decode.cpp similarity index 100% rename from src/libebus/decode.cpp rename to src/lib/ebus/decode.cpp diff --git a/src/libebus/decode.h b/src/lib/ebus/decode.h similarity index 100% rename from src/libebus/decode.h rename to src/lib/ebus/decode.h diff --git a/src/libebus/dump.cpp b/src/lib/ebus/dump.cpp similarity index 100% rename from src/libebus/dump.cpp rename to src/lib/ebus/dump.cpp diff --git a/src/libebus/dump.h b/src/lib/ebus/dump.h similarity index 100% rename from src/libebus/dump.h rename to src/lib/ebus/dump.h diff --git a/src/libebus/encode.cpp b/src/lib/ebus/encode.cpp similarity index 100% rename from src/libebus/encode.cpp rename to src/lib/ebus/encode.cpp diff --git a/src/libebus/encode.h b/src/lib/ebus/encode.h similarity index 100% rename from src/libebus/encode.h rename to src/lib/ebus/encode.h diff --git a/src/libebus/port.cpp b/src/lib/ebus/port.cpp similarity index 100% rename from src/libebus/port.cpp rename to src/lib/ebus/port.cpp diff --git a/src/libebus/port.h b/src/lib/ebus/port.h similarity index 100% rename from src/libebus/port.h rename to src/lib/ebus/port.h diff --git a/src/libebus/result.cpp b/src/lib/ebus/result.cpp similarity index 100% rename from src/libebus/result.cpp rename to src/lib/ebus/result.cpp diff --git a/src/libebus/result.h b/src/lib/ebus/result.h similarity index 100% rename from src/libebus/result.h rename to src/lib/ebus/result.h diff --git a/src/libebus/symbol.cpp b/src/lib/ebus/symbol.cpp similarity index 100% rename from src/libebus/symbol.cpp rename to src/lib/ebus/symbol.cpp diff --git a/src/libebus/symbol.h b/src/lib/ebus/symbol.h similarity index 100% rename from src/libebus/symbol.h rename to src/lib/ebus/symbol.h diff --git a/src/test/Makefile.am b/src/lib/ebus/test/Makefile.am similarity index 53% rename from src/test/Makefile.am rename to src/lib/ebus/test/Makefile.am index 8d9c0746..8236c57c 100644 --- a/src/test/Makefile.am +++ b/src/lib/ebus/test/Makefile.am @@ -1,7 +1,7 @@ AM_CXXFLAGS = -fpic \ -Wall \ -Wextra \ - -I$(top_srcdir)/src/libebus + -I$(top_srcdir)/src/lib/ebus noinst_PROGRAMS = test_port \ test_symbol \ @@ -13,28 +13,28 @@ noinst_PROGRAMS = test_port \ test_encode test_port_SOURCES = test_port.cpp -test_port_LDADD = $(top_srcdir)/src/libebus/libebus.a +test_port_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a test_symbol_SOURCES = test_symbol.cpp -test_symbol_LDADD = $(top_srcdir)/src/libebus/libebus.a +test_symbol_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a test_data_SOURCES = test_data.cpp -test_data_LDADD = $(top_srcdir)/src/libebus/libebus.a +test_data_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a test_bus_SOURCES = test_bus.cpp -test_bus_LDADD = $(top_srcdir)/src/libebus/libebus.a +test_bus_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a test_commands_SOURCES = test_commands.cpp -test_commands_LDADD = $(top_srcdir)/src/libebus/libebus.a +test_commands_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a test_configfile_SOURCES = test_configfile.cpp -test_configfile_LDADD = $(top_srcdir)/src/libebus/libebus.a +test_configfile_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a test_decode_SOURCES = test_decode.cpp -test_decode_LDADD = $(top_srcdir)/src/libebus/libebus.a +test_decode_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a test_encode_SOURCES = test_encode.cpp -test_encode_LDADD = $(top_srcdir)/src/libebus/libebus.a +test_encode_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a distclean-local: -rm -f Makefile.in diff --git a/src/test/command.csv b/src/lib/ebus/test/command.csv similarity index 100% rename from src/test/command.csv rename to src/lib/ebus/test/command.csv diff --git a/src/test/test_bus.cpp b/src/lib/ebus/test/test_bus.cpp similarity index 100% rename from src/test/test_bus.cpp rename to src/lib/ebus/test/test_bus.cpp diff --git a/src/test/test_commands.cpp b/src/lib/ebus/test/test_commands.cpp similarity index 100% rename from src/test/test_commands.cpp rename to src/lib/ebus/test/test_commands.cpp diff --git a/src/test/test_configfile.cpp b/src/lib/ebus/test/test_configfile.cpp similarity index 100% rename from src/test/test_configfile.cpp rename to src/lib/ebus/test/test_configfile.cpp diff --git a/src/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp similarity index 100% rename from src/test/test_data.cpp rename to src/lib/ebus/test/test_data.cpp diff --git a/src/test/test_decode.cpp b/src/lib/ebus/test/test_decode.cpp similarity index 100% rename from src/test/test_decode.cpp rename to src/lib/ebus/test/test_decode.cpp diff --git a/src/test/test_encode.cpp b/src/lib/ebus/test/test_encode.cpp similarity index 100% rename from src/test/test_encode.cpp rename to src/lib/ebus/test/test_encode.cpp diff --git a/src/test/test_port.cpp b/src/lib/ebus/test/test_port.cpp similarity index 100% rename from src/test/test_port.cpp rename to src/lib/ebus/test/test_port.cpp diff --git a/src/test/test_symbol.cpp b/src/lib/ebus/test/test_symbol.cpp similarity index 100% rename from src/test/test_symbol.cpp rename to src/lib/ebus/test/test_symbol.cpp diff --git a/src/lib/utils/Makefile.am b/src/lib/utils/Makefile.am new file mode 100644 index 00000000..d10f81d6 --- /dev/null +++ b/src/lib/utils/Makefile.am @@ -0,0 +1,21 @@ +AM_CXXFLAGS = -fpic \ + -Wall \ + -Wextra + +noinst_LIBRARIES = libutils.a + +libutils_a_SOURCES = wqueue.h \ + notify.h \ + appl.cpp \ + appl.h \ + daemon.cpp \ + daemon.h \ + logger.cpp \ + logger.h \ + thread.cpp \ + thread.h \ + tcpsocket.cpp \ + tcpsocket.h + +distclean-local: + -rm -f Makefile.in diff --git a/src/libcore/appl.cpp b/src/lib/utils/appl.cpp similarity index 100% rename from src/libcore/appl.cpp rename to src/lib/utils/appl.cpp diff --git a/src/libcore/appl.h b/src/lib/utils/appl.h similarity index 100% rename from src/libcore/appl.h rename to src/lib/utils/appl.h diff --git a/src/libcore/daemon.cpp b/src/lib/utils/daemon.cpp similarity index 100% rename from src/libcore/daemon.cpp rename to src/lib/utils/daemon.cpp diff --git a/src/libcore/daemon.h b/src/lib/utils/daemon.h similarity index 100% rename from src/libcore/daemon.h rename to src/lib/utils/daemon.h diff --git a/src/libcore/logger.cpp b/src/lib/utils/logger.cpp similarity index 100% rename from src/libcore/logger.cpp rename to src/lib/utils/logger.cpp diff --git a/src/libcore/logger.h b/src/lib/utils/logger.h similarity index 100% rename from src/libcore/logger.h rename to src/lib/utils/logger.h diff --git a/src/libcore/notify.h b/src/lib/utils/notify.h similarity index 100% rename from src/libcore/notify.h rename to src/lib/utils/notify.h diff --git a/src/libcore/tcpsocket.cpp b/src/lib/utils/tcpsocket.cpp similarity index 100% rename from src/libcore/tcpsocket.cpp rename to src/lib/utils/tcpsocket.cpp diff --git a/src/libcore/tcpsocket.h b/src/lib/utils/tcpsocket.h similarity index 100% rename from src/libcore/tcpsocket.h rename to src/lib/utils/tcpsocket.h diff --git a/src/libcore/thread.cpp b/src/lib/utils/thread.cpp similarity index 100% rename from src/libcore/thread.cpp rename to src/lib/utils/thread.cpp diff --git a/src/libcore/thread.h b/src/lib/utils/thread.h similarity index 100% rename from src/libcore/thread.h rename to src/lib/utils/thread.h diff --git a/src/libcore/wqueue.h b/src/lib/utils/wqueue.h similarity index 100% rename from src/libcore/wqueue.h rename to src/lib/utils/wqueue.h diff --git a/src/libcore/Makefile.am b/src/libcore/Makefile.am deleted file mode 100644 index d1b3b997..00000000 --- a/src/libcore/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -AM_CXXFLAGS = -fpic \ - -Wall \ - -Wextra - -noinst_LIBRARIES = libcore.a - -libcore_a_SOURCES = wqueue.h \ - notify.h \ - appl.cpp \ - appl.h \ - daemon.cpp \ - daemon.h \ - logger.cpp \ - logger.h \ - thread.cpp \ - thread.h \ - tcpsocket.cpp \ - tcpsocket.h - -distclean-local: - -rm -f Makefile.in diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am deleted file mode 100644 index c9b83ddf..00000000 --- a/src/tools/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -AM_CXXFLAGS = -fpic \ - -Wall \ - -Wextra \ - -I$(top_srcdir)/src/libcore \ - -I$(top_srcdir)/src/libebus - -bin_PROGRAMS = ebusctl - -ebusctl_SOURCES = ebusctl.cpp - -ebusctl_LDADD = $(top_srcdir)/src/libcore/libcore.a \ - $(top_srcdir)/src/libebus/libebus.a - -distclean-local: - -rm -f Makefile.in - -rm -rf .libs -