diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | filter/Makefile.am | 2 | ||||
| -rw-r--r-- | include/ulogd/Makefile.am | 2 | ||||
| -rw-r--r-- | include/ulogd/select.h | 22 | ||||
| -rw-r--r-- | include/ulogd/ulogd.h | 1 | ||||
| -rw-r--r-- | libipulog/Makefile.am | 2 | ||||
| -rw-r--r-- | src/select.h | 2 | ||||
| -rw-r--r-- | src/ulogd.c | 1 |
8 files changed, 7 insertions, 27 deletions
diff --git a/configure.in b/configure.in index be28e1f..228dead 100644 --- 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 a063636..55d14c0 100644 --- 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 87eeae3..5201d15 100644 --- 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 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 7fad2b4..1bd0b6c 100644 --- 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 56cc41a..ea2fefa 100644 --- 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 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 c7d80e6..b408fe9 100644 --- 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 |