17 files changed, 43 insertions, 144 deletions
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..98f971a
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,14 @@
+
+AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
+
+man_MANS = ulogd.8
+
+EXTRA_DIST = $(man_MANS)
+
+INCLUDES = $(all_includes) -I$(top_srcdir)/include
+SUBDIRS = src input filter output
+DIST_SUBDIRS = src input filter output
+
+$(OBJECTS): libtool
+libtool: $(LIBTOOL_DEPS)
+	$(SHELL) ./config.status --recheck
diff --git a/filter/Makefile.am b/filter/Makefile.am
new file mode 100644
index 0000000..25f2516
--- /dev/null
+++ b/filter/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = raw2packet packet2flow
diff --git a/filter/packet2flow/Makefile.am b/filter/packet2flow/Makefile.am
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/filter/packet2flow/Makefile.am
diff --git a/filter/raw2packet/Makefile.am b/filter/raw2packet/Makefile.am
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/filter/raw2packet/Makefile.am
diff --git a/filter/raw2packet/Makefile.in b/filter/raw2packet/Makefile.in
deleted file mode 100644
index 3efa4de..0000000
--- a/filter/raw2packet/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-include @top_srcdir@/Rules.make
-
-CFLAGS+=-I@top_srcdir@ -I@top_srcdir@/libipulog/include -I@top_srcdir@/include
-SH_CFLAGS:=$(CFLAGS) -fPIC
-
-#  Normally You should not need to change anything below
-#
-
-SHARED_LIBS=ulogd_raw2packet_BASE.so
-
-all: $(SHARED_LIBS)
-
-distrib:
-
-$(SHARED_LIBS): %.so: %_sh.o
-	$(LD) -shared -o $@ $< -lc -lpcap
-
-%_sh.o: %.c
-	$(CC) $(SH_CFLAGS) -o $@ -c $<
-	
-clean:
-	$(RM) $(SHARED_LIBS) *.o
-
-distclean:
-	$(RM) Makefile
-
-install: all
-	$(INSTALL) -m 755 -d $(DESTDIR)$(ULOGD_LIB_PATH)
-	$(INSTALL) -m 755 *.so $(DESTDIR)$(ULOGD_LIB_PATH)
diff --git a/input/Makefile.am b/input/Makefile.am
new file mode 100644
index 0000000..77f2838
--- /dev/null
+++ b/input/Makefile.am
@@ -0,0 +1,2 @@
+
+SUBDIRS = packet flow
diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am
new file mode 100644
index 0000000..474e155
--- /dev/null
+++ b/input/flow/Makefile.am
@@ -0,0 +1,7 @@
+
+CFLAGS=-fPIC -Wall
+
+lib_LTLIBRARIES = ulogd_inpflow_CTNL.la # ulogd_inpflow_IPFIX.la
+
+ulogd_inpflow_CTNL_la_SOURCES = ulogd_inpflow_CTNL.c
+ulogd_inpflow_IPFIX_la_SOURCES = ulogd_inpflow_IPFIX.c
diff --git a/input/flow/Makefile.in b/input/flow/Makefile.in
deleted file mode 100644
index ddb20f4..0000000
--- a/input/flow/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-include @top_srcdir@/Rules.make
-
-CFLAGS+=-I@top_srcdir@ -I@top_srcdir@/libipulog/include -I@top_srcdir@/include
-SH_CFLAGS:=$(CFLAGS) -fPIC
-
-#  Normally You should not need to change anything below
-#
-
-SHARED_LIBS=ulogd_inpflow_CTNL.so
-
-all: $(SHARED_LIBS)
-
-distrib:
-
-$(SHARED_LIBS): %.so: %_sh.o
-	$(LD) -shared -o $@ $< -lc -lpcap
-
-%_sh.o: %.c
-	$(CC) $(SH_CFLAGS) -o $@ -c $<
-	
-clean:
-	$(RM) $(SHARED_LIBS) *.o
-
-distclean:
-	$(RM) Makefile
-
-install: all
-	$(INSTALL) -m 755 -d $(DESTDIR)$(ULOGD_LIB_PATH)
-	$(INSTALL) -m 755 *.so $(DESTDIR)$(ULOGD_LIB_PATH)
diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
new file mode 100644
index 0000000..748496b
--- /dev/null
+++ b/input/packet/Makefile.am
@@ -0,0 +1,7 @@
+
+CFLAGS=-fPIC -Wall
+
+lib_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la
+
+ulogd_inppkt_NFLOG_la_SOURCES = ulogd_inppkt_NFLOG.c
+ulogd_inppkt_ULOG_la_SOURCES = ulogd_inppkt_ULOG.c
diff --git a/input/packet/Makefile.in b/input/packet/Makefile.in
deleted file mode 100644
index 78ae382..0000000
--- a/input/packet/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-include @top_srcdir@/Rules.make
-
-CFLAGS+=-I@top_srcdir@ -I@top_srcdir@/libipulog/include -I@top_srcdir@/include
-SH_CFLAGS:=$(CFLAGS) -fPIC
-
-#  Normally You should not need to change anything below
-#
-
-SHARED_LIBS=ulogd_inppkt_ULOG.so ulogd_inppkt_NFLOG.so
-
-all: $(SHARED_LIBS)
-
-distrib:
-
-$(SHARED_LIBS): %.so: %_sh.o
-	$(LD) -shared -o $@ $< -lc -lpcap
-
-%_sh.o: %.c
-	$(CC) $(SH_CFLAGS) -o $@ -c $<
-	
-clean:
-	$(RM) $(SHARED_LIBS) *.o
-
-distclean:
-	$(RM) Makefile
-
-install: all
-	$(INSTALL) -m 755 -d $(DESTDIR)$(ULOGD_LIB_PATH)
-	$(INSTALL) -m 755 *.so $(DESTDIR)$(ULOGD_LIB_PATH)
diff --git a/libipulog/Makefile b/libipulog/Makefile
deleted file mode 100644
index ab4d09b..0000000
--- a/libipulog/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated automatically from Makefile.in by configure.
-#
-
-include ../Rules.make
-CFLAGS+=-Iinclude -I/usr/src/linux/include
-
-libipulog.a: libipulog.o
-	$(LD) -i $< -o $@
-
-distrib:
-
-ulog_test: ulog_test.c libipulog.a
-	$(CC) $(CFLAGS) ulog_test.c libipulog.a -o ulog_test
-
-libipulog.o: libipulog.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-clean:
-	$(RM) ulog_test libipulog.o libipulog.a
-
-distclean: clean
-	$(RM) Makefile
-
-install: libipulog.a
diff --git a/output/Makefile.am b/output/Makefile.am
new file mode 100644
index 0000000..2039bb9
--- /dev/null
+++ b/output/Makefile.am
@@ -0,0 +1,8 @@
+
+lib_LTLIBRARIES = ulogd_output_LOGEMU.la # ulogd_output_OPRINT.la ulogd_output_SYSLOG.la
+
+ulogd_output_LOGEMU_SOURCES = ulogd_output_LOGEMU.c
+ulogd_output_SYSLOG_SOURCES = ulogd_output_SYSLOG.c
+ulogd_output_OPRINT_SOURCES = ulogd_output_OPRINT.c
+
+
diff --git a/output/Makefile.in b/output/Makefile.in
deleted file mode 100644
index 6641e6a..0000000
--- a/output/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-include @top_srcdir@/Rules.make
-
-CFLAGS+=-I@top_srcdir@ -I@top_srcdir@/libipulog/include -I@top_srcdir@/include
-SH_CFLAGS:=$(CFLAGS) -fPIC
-
-#  Normally You should not need to change anything below
-#
-
-SHARED_LIBS=ulogd_output_LOGEMU.so
-
-all: $(SHARED_LIBS)
-
-distrib:
-
-$(SHARED_LIBS): %.so: %_sh.o
-	$(LD) -shared -o $@ $< -lc -lpcap
-
-%_sh.o: %.c
-	$(CC) $(SH_CFLAGS) -o $@ -c $<
-	
-clean:
-	$(RM) $(SHARED_LIBS) *.o
-
-distclean:
-	$(RM) Makefile
-
-install: all
-	$(INSTALL) -m 755 -d $(DESTDIR)$(ULOGD_LIB_PATH)
-	$(INSTALL) -m 755 *.so $(DESTDIR)$(ULOGD_LIB_PATH)
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..b39bfcb
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,4 @@
+bin_PROGRAMS = ulogd
+
+ulogd_SOURCES = ulogd.c select.c ../conffile/conffile.c
+
diff --git a/select.c b/src/select.c
index 7d7bff9..7d7bff9 100644
--- a/select.c
+++ b/src/select.c
diff --git a/select.h b/src/select.h
index bcfb66d..bcfb66d 100644
--- a/select.h
+++ b/src/select.h
diff --git a/ulogd.c b/src/ulogd.c
index af6a8f7..af6a8f7 100644
--- a/ulogd.c
+++ b/src/ulogd.c