file struturce changed.

.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

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

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])
 

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
+

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:

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

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

src/libcore/Makefile.am

@@ -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

src/tools/Makefile.am

@@ -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
-