[netfilter-cvslog] r6383 - in branches/ulog/ulogd2: . filter include/ulogd libipulog src

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2006-01-09 00:06:26 +0100 (Mon, 09 Jan 2006)
New Revision: 6383

Removed:
   branches/ulog/ulogd2/include/ulogd/select.h
   branches/ulog/ulogd2/src/select.h
Modified:
   branches/ulog/ulogd2/configure.in
   branches/ulog/ulogd2/filter/Makefile.am
   branches/ulog/ulogd2/include/ulogd/Makefile.am
   branches/ulog/ulogd2/include/ulogd/ulogd.h
   branches/ulog/ulogd2/libipulog/Makefile.am
   branches/ulog/ulogd2/src/ulogd.c
Log:
now 'make dist-bzip2' finally works


Modified: branches/ulog/ulogd2/configure.in
===================================================================
--- branches/ulog/ulogd2/configure.in	2006-01-08 22:55:39 UTC (rev 6382)
+++ branches/ulog/ulogd2/configure.in	2006-01-08 23:06:26 UTC (rev 6383)
@@ -62,7 +62,7 @@
 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 \

Modified: branches/ulog/ulogd2/filter/Makefile.am
===================================================================
--- branches/ulog/ulogd2/filter/Makefile.am	2006-01-08 22:55:39 UTC (rev 6382)
+++ branches/ulog/ulogd2/filter/Makefile.am	2006-01-08 23:06:26 UTC (rev 6383)
@@ -2,6 +2,8 @@
 
 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

Modified: branches/ulog/ulogd2/include/ulogd/Makefile.am
===================================================================
--- branches/ulog/ulogd2/include/ulogd/Makefile.am	2006-01-08 22:55:39 UTC (rev 6382)
+++ branches/ulog/ulogd2/include/ulogd/Makefile.am	2006-01-08 23:06:26 UTC (rev 6383)
@@ -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

Deleted: branches/ulog/ulogd2/include/ulogd/select.h
===================================================================
--- branches/ulog/ulogd2/include/ulogd/select.h	2006-01-08 22:55:39 UTC (rev 6382)
+++ branches/ulog/ulogd2/include/ulogd/select.h	2006-01-08 23:06:26 UTC (rev 6383)
@@ -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

Modified: branches/ulog/ulogd2/include/ulogd/ulogd.h
===================================================================
--- branches/ulog/ulogd2/include/ulogd/ulogd.h	2006-01-08 22:55:39 UTC (rev 6382)
+++ branches/ulog/ulogd2/include/ulogd/ulogd.h	2006-01-08 23:06:26 UTC (rev 6383)
@@ -237,6 +237,7 @@
 
 int ulogd_register_fd(struct ulogd_fd *ufd);
 void ulogd_unregister_fd(struct ulogd_fd *ufd);
+int ulogd_select_main();
 
 /***********************************************************************
  * timer handling

Modified: branches/ulog/ulogd2/libipulog/Makefile.am
===================================================================
--- branches/ulog/ulogd2/libipulog/Makefile.am	2006-01-08 22:55:39 UTC (rev 6382)
+++ branches/ulog/ulogd2/libipulog/Makefile.am	2006-01-08 23:06:26 UTC (rev 6383)
@@ -1,4 +1,6 @@
 
+INCLUDES = $(all_includes) -I$(top_srcdir)/include
+
 AM_CFLAGS=-fPIC
 
 noinst_LIBRARIES = libipulog.a

Deleted: branches/ulog/ulogd2/src/select.h
===================================================================
--- branches/ulog/ulogd2/src/select.h	2006-01-08 22:55:39 UTC (rev 6382)
+++ branches/ulog/ulogd2/src/select.h	2006-01-08 23:06:26 UTC (rev 6383)
@@ -1,2 +0,0 @@
-
-extern int ulogd_select_main();

Modified: branches/ulog/ulogd2/src/ulogd.c
===================================================================
--- branches/ulog/ulogd2/src/ulogd.c	2006-01-08 22:55:39 UTC (rev 6382)
+++ branches/ulog/ulogd2/src/ulogd.c	2006-01-08 23:06:26 UTC (rev 6383)
@@ -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