From ea4c61fd022d4f0b46b556948e757102e28f2566 Mon Sep 17 00:00:00 2001 From: "/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org" Date: Sun, 8 Jan 2006 22:55:39 +0000 Subject: further 'make dist' fixes --- Makefile.am | 3 +-- configure.in | 8 +++++- include/Makefile.am | 1 + include/libipulog/libipulog.h | 60 +++++++++++++++++++++++++++++++++++++++++++ include/ulogd/Makefile.am | 2 ++ libipulog/libipulog.c | 2 +- libipulog/libipulog.h | 60 ------------------------------------------- 7 files changed, 72 insertions(+), 64 deletions(-) create mode 100644 include/Makefile.am create mode 100644 include/libipulog/libipulog.h create mode 100644 include/ulogd/Makefile.am delete mode 100644 libipulog/libipulog.h diff --git a/Makefile.am b/Makefile.am index 677fe2c..f4e9e4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,8 +6,7 @@ man_MANS = ulogd.8 EXTRA_DIST = $(man_MANS) INCLUDES = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = doc libipulog src input filter output -DIST_SUBDIRS = doc src input filter output +SUBDIRS = include doc libipulog src input filter output $(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) diff --git a/configure.in b/configure.in index e971e7d..be28e1f 100644 --- a/configure.in +++ b/configure.in @@ -61,4 +61,10 @@ dnl AC_SUBST(HAVE_PCAP_H) dnl AM_CONDITIONAL(HAVE_MYSQL, test x$mysqldir != x) dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x) -AC_OUTPUT(doc/Makefile libipulog/Makefile input/Makefile input/packet/Makefile input/flow/Makefile filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile output/Makefile output/pcap/Makefile output/mysql/Makefile output/pgsql/Makefile output/sqlite3/Makefile src/Makefile Makefile Rules.make) +AC_OUTPUT(doc/Makefile \ + include/Makefile include/ulogd/Makefile \ + libipulog/Makefile \ + input/Makefile input/packet/Makefile input/flow/Makefile \ + filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \ + output/Makefile output/pcap/Makefile output/mysql/Makefile output/pgsql/Makefile output/sqlite3/Makefile \ + src/Makefile Makefile Rules.make) diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 0000000..fa34473 --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = ulogd libipulog diff --git a/include/libipulog/libipulog.h b/include/libipulog/libipulog.h new file mode 100644 index 0000000..a049d27 --- /dev/null +++ b/include/libipulog/libipulog.h @@ -0,0 +1,60 @@ +#ifndef _LIBIPULOG_H +#define _LIBIPULOG_H + +/* $Id$ */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* FIXME: glibc sucks */ +#ifndef MSG_TRUNC +#define MSG_TRUNC 0x20 +#endif + +struct ipulog_handle; +extern int ipulog_errno; + +u_int32_t ipulog_group2gmask(u_int32_t group); + +struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, u_int32_t rmem); + +void ipulog_destroy_handle(struct ipulog_handle *h); + +ssize_t ipulog_read(struct ipulog_handle *h, + unsigned char *buf, size_t len, int timeout); + +ulog_packet_msg_t *ipulog_get_packet(struct ipulog_handle *h, + const unsigned char *buf, + size_t len); + +char *ipulog_strerror(int errcode); + +int ipulog_get_fd(struct ipulog_handle *h); + +void ipulog_perror(const char *s); + +enum +{ + IPULOG_ERR_NONE = 0, + IPULOG_ERR_IMPL, + IPULOG_ERR_HANDLE, + IPULOG_ERR_SOCKET, + IPULOG_ERR_BIND, + IPULOG_ERR_RECVBUF, + IPULOG_ERR_RECV, + IPULOG_ERR_NLEOF, + IPULOG_ERR_TRUNC, + IPULOG_ERR_INVGR, + IPULOG_ERR_INVNL, +}; +#define IPULOG_MAXERR IPULOG_ERR_INVNL + +#endif /* _LIBULOG_H */ diff --git a/include/ulogd/Makefile.am b/include/ulogd/Makefile.am new file mode 100644 index 0000000..87eeae3 --- /dev/null +++ b/include/ulogd/Makefile.am @@ -0,0 +1,2 @@ + +noinst_HEADERS = conffile.h db.h ipfix_protocol.h linuxlist.h select.h ulogd.h diff --git a/libipulog/libipulog.c b/libipulog/libipulog.c index 6d2ade0..8917bcc 100644 --- a/libipulog/libipulog.c +++ b/libipulog/libipulog.c @@ -29,7 +29,7 @@ #include #include #include -#include "libipulog.h" +#include struct ipulog_handle { diff --git a/libipulog/libipulog.h b/libipulog/libipulog.h deleted file mode 100644 index a049d27..0000000 --- a/libipulog/libipulog.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef _LIBIPULOG_H -#define _LIBIPULOG_H - -/* $Id$ */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* FIXME: glibc sucks */ -#ifndef MSG_TRUNC -#define MSG_TRUNC 0x20 -#endif - -struct ipulog_handle; -extern int ipulog_errno; - -u_int32_t ipulog_group2gmask(u_int32_t group); - -struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, u_int32_t rmem); - -void ipulog_destroy_handle(struct ipulog_handle *h); - -ssize_t ipulog_read(struct ipulog_handle *h, - unsigned char *buf, size_t len, int timeout); - -ulog_packet_msg_t *ipulog_get_packet(struct ipulog_handle *h, - const unsigned char *buf, - size_t len); - -char *ipulog_strerror(int errcode); - -int ipulog_get_fd(struct ipulog_handle *h); - -void ipulog_perror(const char *s); - -enum -{ - IPULOG_ERR_NONE = 0, - IPULOG_ERR_IMPL, - IPULOG_ERR_HANDLE, - IPULOG_ERR_SOCKET, - IPULOG_ERR_BIND, - IPULOG_ERR_RECVBUF, - IPULOG_ERR_RECV, - IPULOG_ERR_NLEOF, - IPULOG_ERR_TRUNC, - IPULOG_ERR_INVGR, - IPULOG_ERR_INVNL, -}; -#define IPULOG_MAXERR IPULOG_ERR_INVNL - -#endif /* _LIBULOG_H */ -- cgit v1.2.3