now 'make dist-bzip2' finally works

diff --git a/configure.in b/configure.in
index be28e1f0dcf0581a54512e8310b67a8c796e0435..228dead0a2771736175332060b19cdd461a866a8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -62,7 +62,7 @@ dnl AM_CONDITIONAL(HAVE_MYSQL, test x$mysqldir != x)
 dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x)
 
 AC_OUTPUT(doc/Makefile \
-         include/Makefile include/ulogd/Makefile \
+         include/Makefile include/ulogd/Makefile include/libipulog/Makefile \
          libipulog/Makefile \
          input/Makefile input/packet/Makefile input/flow/Makefile \
          filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \

diff --git a/filter/Makefile.am b/filter/Makefile.am
index a063636d99b375468bbd980ab1e7037431d78aeb..55d14c0ae03c715d1c14af438156160cc3b5c4bc 100644 (file)
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = raw2packet packet2flow
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
 
+noinst_HEADERS = rtnl.h iftable.h
+
 pkglib_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la
 
 ulogd_filter_IFINDEX_la_SOURCES = ulogd_filter_IFINDEX.c rtnl.c iftable.c

diff --git a/include/ulogd/Makefile.am b/include/ulogd/Makefile.am
index 87eeae39e6585701637bdcb571f802be348f5a01..5201d15d620a90d4886a29630efb93228642609b 100644 (file)
--- a/include/ulogd/Makefile.am
+++ b/include/ulogd/Makefile.am
@@ -1,2 +1,2 @@
 
-noinst_HEADERS = conffile.h db.h ipfix_protocol.h linuxlist.h select.h ulogd.h
+noinst_HEADERS = conffile.h db.h ipfix_protocol.h linuxlist.h ulogd.h

diff --git a/include/ulogd/select.h b/include/ulogd/select.h
deleted file mode 100644 (file)
index 4558555..0000000
--- a/include/ulogd/select.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef ULOGD_SELECT_H
-#define ULOGD_SELECT_H
-
-#include <ulogd/linuxlist.h>
-
-#define ULOGD_FD_F_READ                0x0001
-#define ULOGD_FD_F_WRITE       0x0002
-
-struct ulogd_fd {
-       struct list_head list;
-       int fd;
-       unsigned int flags;
-       void *data;
-       int (*cb)(int fd, int flags, void *data);
-};
-
-
-int ulogd_register_fd(struct ulogd_fd *fd);
-int ulogd_unregister_fd(struct ulogd_fd *fd);
-int ulogd_select_main();
-
-#endif

diff --git a/include/ulogd/ulogd.h b/include/ulogd/ulogd.h
index 7fad2b4b6c49c3ac3fcb328dd0446569d1502e95..1bd0b6cf8dab94a052ef91932266b7a5036f39ed 100644 (file)
--- a/include/ulogd/ulogd.h
+++ b/include/ulogd/ulogd.h
@@ -237,6 +237,7 @@ struct ulogd_fd {
 
 int ulogd_register_fd(struct ulogd_fd *ufd);
 void ulogd_unregister_fd(struct ulogd_fd *ufd);
+int ulogd_select_main();
 
 /***********************************************************************
  * timer handling

diff --git a/libipulog/Makefile.am b/libipulog/Makefile.am
index 56cc41a409f0bfcb59c8daac1341a658506f2812..ea2fefad6a707daffb99c99a9f85b6f38d5b55ce 100644 (file)
--- a/libipulog/Makefile.am
+++ b/libipulog/Makefile.am
@@ -1,4 +1,6 @@
 
+INCLUDES = $(all_includes) -I$(top_srcdir)/include
+
 AM_CFLAGS=-fPIC
 
 noinst_LIBRARIES = libipulog.a

diff --git a/src/select.h b/src/select.h
deleted file mode 100644 (file)
index bcfb66d..0000000
--- a/src/select.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-extern int ulogd_select_main();

diff --git a/src/ulogd.c b/src/ulogd.c
index c7d80e6b76ea30085cbc4a9eeaad1bcd55b34e60..b408fe9eaf5c2a3924d6d096a73527c9f37e8e3d 100644 (file)
--- a/src/ulogd.c
+++ b/src/ulogd.c
@@ -63,7 +63,6 @@
 #include <syslog.h>
 #include <ulogd/conffile.h>
 #include <ulogd/ulogd.h>
-#include "select.h"
 #ifdef DEBUG
 #define DEBUGP(format, args...) fprintf(stderr, format, ## args)
 #else