Revert "Merge branch 'enhanced_device' of github.com:john30/ebusd"

This reverts commit aaccb15a9b, reversing
changes made to edfe09a383.

src/lib/ebus/test/CMakeLists.txt

@@ -11,6 +11,10 @@ add_executable(test_filereader test_filereader.cpp)
 target_link_libraries(test_filereader ebus pthread)
 add_test(filereader test_filereader)
 
+add_executable(test_device test_device.cpp)
+target_link_libraries(test_device ebus pthread ${test_LIBS})
+add_test(device test_device)
+
 add_executable(test_symbol test_symbol.cpp)
 target_link_libraries(test_symbol ebus pthread)
 add_test(symbol test_symbol)

src/lib/ebus/test/Makefile.am

@@ -3,6 +3,7 @@ AM_CXXFLAGS = -I$(top_srcdir)/src \
 	      -Wno-unused-parameter
 
 noinst_PROGRAMS = test_filereader \
+		  test_device \
 		  test_symbol \
 		  test_data \
 		  test_message
@@ -10,6 +11,9 @@ noinst_PROGRAMS = test_filereader \
 test_filereader_SOURCES = test_filereader.cpp
 test_filereader_LDADD = ../libebus.a -lpthread
 
+test_device_SOURCES = test_device.cpp
+test_device_LDADD = ../libebus.a -lpthread
+
 test_symbol_SOURCES = test_symbol.cpp
 test_symbol_LDADD = ../libebus.a -lpthread
 
@@ -20,6 +24,7 @@ test_message_SOURCES = test_message.cpp
 test_message_LDADD = ../libebus.a -lpthread
 
 if CONTRIB
+test_device_LDADD += ../contrib/libebuscontrib.a
 test_data_LDADD += ../contrib/libebuscontrib.a
 test_message_LDADD += ../contrib/libebuscontrib.a
 endif