NEW: ebus-daemon merged into ebusd.

Makefile.am

@@ -1,8 +1,30 @@
-SUBDIRS = lib src tools
+AUTOMAKE_OPTIONS = subdir-objects
 
-distclean-local:
-	-rm -rf autom4te.cache
-	-rm -f aclocal.m4
-	-rm -f config.h.in
-	-rm -f configure
-	-rm -f Makefile.in
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+AM_CXXFLAGS = $(LIBEBUS_CFLAGS) -I$(top_srcdir)/utils -fpic -Wall -Wextra
+
+bin_PROGRAMS = ebusd
+
+ebusd_SOURCES = src/main.cpp \
+	        src/baseloop.cpp \
+		src/ebusloop.cpp \
+		src/cycdata.cpp \
+		src/network.cpp \
+		utils/thread.cpp \
+		utils/logger.cpp \
+		utils/tcpsocket.cpp \
+		utils/daemon.cpp \
+		utils/appl.cpp
+
+ebusd_LDADD = $(LIBEBUS_LIBS) \
+	      -lpthread
+
+dist_noinst_SCRIPTS = autogen.sh
+
+noinst_PROGRAMS = feed
+
+feed_SOURCES = test/feed.cpp \
+	       utils/appl.cpp
+
+feed_LDADD = $(LIBEBUS_LIBS)