Changed tree. Added all folders to build.

9 files changed, 39 insertions, 3 deletions

diff --git a/util/elapi_debug.h b/collection/elapi_debug.h
index 3da0685..3da0685 100644
--- a/util/elapi_debug.h
+++ b/collection/elapi_debug.h
diff --git a/tools/elapi_tools.c b/collection/elapi_tools.c
index d1d00c0..d1d00c0 100644
--- a/tools/elapi_tools.c
+++ b/collection/elapi_tools.c
diff --git a/tools/elapi_tools.h b/collection/elapi_tools.h
index fd9bf63..fd9bf63 100644
--- a/tools/elapi_tools.h
+++ b/collection/elapi_tools.h
diff --git a/dispatcher/Makefile.am b/dispatcher/Makefile.am
new file mode 100644
index 0000000..ea5b5ff
--- /dev/null
+++ b/dispatcher/Makefile.am
@@ -0,0 +1,12 @@
+DEBUG_FLAGS=@DEBUG_VAR@ 
+
+AM_CPPFLAGS = -I$(srcdir)/../collection -I$(srcdir)/../sinks -I/usr/include/libxml2 $(DEBUG_FLAGS)
+common_headers=elapi_collection.h elapi_debug.h elapi_tools.h elapi_dispatcher.h elapi_sink.h
+
+noinst_LIBRARIES = libelapi_dispatcher.a
+libelapi_dispatcher_a_SOURCES = elapi_dispatcher.c $(common_headers)
+
+noinst_PROGRAMS = elapi_dispatcher_ut
+elapi_dispatcher_ut_SOURCES = elapi_dispatcher_ut.c $(common_headers)
+elapi_dispatcher_ut_LDADD = libelapi_dispatcher.a ../ini/libelapi_ini.a -lm -lz -lxml2 ../collection/libelapi_collection.a \
+../sinks/stderr/libelapi_sink_stderr.la ../sinks/syslog/libelapi_sink_syslog.la
diff --git a/ini/Makefile.am b/ini/Makefile.am
new file mode 100644
index 0000000..7e50b8d
--- /dev/null
+++ b/ini/Makefile.am
@@ -0,0 +1,11 @@
+DEBUG_FLAGS=@DEBUG_VAR@ 
+
+AM_CPPFLAGS = -I$(srcdir)/../collection $(DEBUG_FLAGS)
+common_headers=elapi_ini.h elapi_collection.h elapi_debug.h elapi_tools.h
+
+noinst_LIBRARIES = libelapi_ini.a
+libelapi_ini_a_SOURCES = elapi_ini.c $(common_headers)
+
+noinst_PROGRAMS = elapi_ini_ut
+elapi_ini_ut_SOURCES = elapi_ini_ut.c $(common_headers)
+elapi_ini_ut_LDADD = libelapi_ini.a -lm -lz -lxml2 ../collection/libelapi_collection.a
diff --git a/ini/elapi_ini_ut b/ini/elapi_ini_ut
deleted file mode 100755
index 18deb77..0000000
--- a/ini/elapi_ini_ut
+++ /dev/null
diff --git a/sinks/stderr/Makefile.am b/sinks/stderr/Makefile.am
new file mode 100644
index 0000000..7c77e5c
--- /dev/null
+++ b/sinks/stderr/Makefile.am
@@ -0,0 +1,7 @@
+topdir=../..
+DEBUG_FLAGS=@DEBUG_VAR@
+AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../../collection -I/usr/include/libxml2 $(DEBUG_FLAGS) 
+
+lib_LTLIBRARIES = libelapi_sink_stderr.la
+libelapi_sink_stderr_la_SOURCES = elapi_sink_stderr.c
+include_HEADERS = ../elapi_sink.h
diff --git a/sinks/syslog/Makefile.am b/sinks/syslog/Makefile.am
new file mode 100644
index 0000000..67b3ca2
--- /dev/null
+++ b/sinks/syslog/Makefile.am
@@ -0,0 +1,9 @@
+topdir=../..
+DEBUG_FLAGS=@DEBUG_VAR@
+AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../../collection -I$(srcdir)/../../ini -I/usr/include/libxml2 $(DEBUG_FLAGS) 
+
+
+lib_LTLIBRARIES = libelapi_sink_syslog.la
+libelapi_sink_syslog_la_SOURCES = elapi_sink_syslog.c $(topdir)/ini/elapi_ini.c
+
+include_HEADERS = ../elapi_sink.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index 620da70..0000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-lib_LIBRARIES = libelapi_tools.a
-libelapi_tools_a_SOURCES = elapi_tools.c
-