From 322b293a7f3382925499bd63e0325814593cf11f Mon Sep 17 00:00:00 2001 From: laforge Date: Mon, 9 Dec 2002 14:42:43 +0000 Subject: fix include paths. --- ulogd/Makefile.in | 2 +- ulogd/conffile/Makefile.in | 1 + ulogd/extensions/Makefile.in | 2 +- ulogd/extensions/ulogd_BASE.c | 6 +++--- ulogd/extensions/ulogd_LOCAL.c | 2 +- ulogd/extensions/ulogd_LOGEMU.c | 8 ++++---- ulogd/extensions/ulogd_OPRINT.c | 8 ++++---- ulogd/extensions/ulogd_PWSNIFF.c | 6 +++--- ulogd/mysql/Makefile.in | 2 +- ulogd/mysql/ulogd_MYSQL.c | 8 ++++---- ulogd/pcap/Makefile.in | 8 ++++---- ulogd/pcap/ulogd_PCAP.c | 6 +++--- ulogd/pgsql/Makefile.in | 2 +- ulogd/pgsql/ulogd_PGSQL.c | 5 ++--- ulogd/ulogd.c | 10 +++++----- 15 files changed, 38 insertions(+), 38 deletions(-) diff --git a/ulogd/Makefile.in b/ulogd/Makefile.in index 598ebcb..a7d01e1 100644 --- a/ulogd/Makefile.in +++ b/ulogd/Makefile.in @@ -1,7 +1,7 @@ # include @top_srcdir@/Rules.make -CFLAGS+=-I@top_srcdir@/libipulog/include -I@top_srcdir@/conffile +CFLAGS+=-I@top_srcdir@/libipulog/include -I@top_srcdir@/include SUBDIRS=conffile libipulog extensions doc diff --git a/ulogd/conffile/Makefile.in b/ulogd/conffile/Makefile.in index 85b9733..907e6a7 100644 --- a/ulogd/conffile/Makefile.in +++ b/ulogd/conffile/Makefile.in @@ -1,6 +1,7 @@ # include @top_srcdir@/Rules.make +CFLAGS+=-I@top_srcdir@/include/ulogd # Normally You should not need to change anything below diff --git a/ulogd/extensions/Makefile.in b/ulogd/extensions/Makefile.in index 4ec35b4..b25baea 100644 --- a/ulogd/extensions/Makefile.in +++ b/ulogd/extensions/Makefile.in @@ -4,7 +4,7 @@ # include @top_srcdir@/Rules.make -CFLAGS+=-I@top_srcdir@ -I@top_srcdir@/libipulog/include -I@top_srcdir@/conffile +CFLAGS+=-I@top_srcdir@ -I@top_srcdir@/libipulog/include -I@top_srcdir@/include SH_CFLAGS:=$(CFLAGS) -fPIC SHARED_LIBS+=$(foreach T,$(ULOGD_SL),ulogd_$(T).so) diff --git a/ulogd/extensions/ulogd_BASE.c b/ulogd/extensions/ulogd_BASE.c index 180370b..d86ec94 100644 --- a/ulogd/extensions/ulogd_BASE.c +++ b/ulogd/extensions/ulogd_BASE.c @@ -1,4 +1,4 @@ -/* ulogd_MAC.c, Version $Revision: 1.13 $ +/* ulogd_MAC.c, Version $Revision: 1.14 $ * * ulogd interpreter plugin for * o MAC addresses @@ -26,18 +26,18 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * $Id: ulogd_BASE.c,v 1.13 2002/08/25 15:43:51 laforge Exp $ + * $Id: ulogd_BASE.c,v 1.14 2002/08/28 09:41:17 laforge Exp $ * */ #include #include -#include #include #include #include #include #include +#include /*********************************************************************** * Raw header diff --git a/ulogd/extensions/ulogd_LOCAL.c b/ulogd/extensions/ulogd_LOCAL.c index 3ecf2b5..e396cf5 100644 --- a/ulogd/extensions/ulogd_LOCAL.c +++ b/ulogd/extensions/ulogd_LOCAL.c @@ -27,8 +27,8 @@ #include #include -#include #include +#include #ifdef DEBUG_LOCAL #define DEBUGP(x) ulogd_log(ULOGD_DEBUG, x) diff --git a/ulogd/extensions/ulogd_LOGEMU.c b/ulogd/extensions/ulogd_LOGEMU.c index 4faf95f..c31708f 100644 --- a/ulogd/extensions/ulogd_LOGEMU.c +++ b/ulogd/extensions/ulogd_LOGEMU.c @@ -1,4 +1,4 @@ -/* ulogd_LOGEMU.c, Version $Revision: 1.8 $ +/* ulogd_LOGEMU.c, Version $Revision: 1.9 $ * * ulogd output target for syslog logging emulation * @@ -20,7 +20,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: ulogd_LOGEMU.c,v 1.8 2001/09/27 15:45:25 laforge Exp $ + * $Id: ulogd_LOGEMU.c,v 1.9 2002/04/27 19:45:51 laforge Exp $ * */ @@ -32,8 +32,8 @@ #include #include #include -#include "ulogd.h" -#include "conffile.h" +#include +#include #ifndef ULOGD_LOGEMU_DEFAULT #define ULOGD_LOGEMU_DEFAULT "/var/log/ulogd.syslogemu" diff --git a/ulogd/extensions/ulogd_OPRINT.c b/ulogd/extensions/ulogd_OPRINT.c index 8195bf0..7ff5e76 100644 --- a/ulogd/extensions/ulogd_OPRINT.c +++ b/ulogd/extensions/ulogd_OPRINT.c @@ -1,4 +1,4 @@ -/* ulogd_MAC.c, Version $Revision: 1.7 $ +/* ulogd_MAC.c, Version $Revision: 1.8 $ * * ulogd output target for logging to a file * @@ -17,15 +17,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: ulogd_OPRINT.c,v 1.6 2000/11/20 11:43:22 laforge Exp $ + * $Id: ulogd_OPRINT.c,v 1.8 2001/09/01 11:51:54 laforge Exp $ * */ #include #include #include -#include "ulogd.h" -#include "conffile.h" +#include +#include #ifndef ULOGD_OPRINT_DEFAULT #define ULOGD_OPRINT_DEFAULT "/var/log/ulogd.pktlog" diff --git a/ulogd/extensions/ulogd_PWSNIFF.c b/ulogd/extensions/ulogd_PWSNIFF.c index 4d0d85b..0adf3d6 100644 --- a/ulogd/extensions/ulogd_PWSNIFF.c +++ b/ulogd/extensions/ulogd_PWSNIFF.c @@ -1,4 +1,4 @@ -/* ulogd_PWSNIFF.c, Version $Revision: 1.4 $ +/* ulogd_PWSNIFF.c, Version $Revision: 1.5 $ * * ulogd logging interpreter for POP3 / FTP like plaintext passwords. * @@ -17,17 +17,17 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: ulogd_PWSNIFF.c,v 1.4 2000/11/20 11:43:22 laforge Exp $ + * $Id: ulogd_PWSNIFF.c,v 1.5 2001/09/01 11:51:54 laforge Exp $ * */ #include #include -#include #include #include #include #include +#include #ifdef DEBUG_PWSNIFF #define DEBUGP(x) ulogd_log(ULOGD_DEBUG, x) diff --git a/ulogd/mysql/Makefile.in b/ulogd/mysql/Makefile.in index 0376c83..7e4184b 100644 --- a/ulogd/mysql/Makefile.in +++ b/ulogd/mysql/Makefile.in @@ -4,7 +4,7 @@ # include @top_srcdir@/Rules.make -CFLAGS+=-I@top_srcdir@ -I@top_srcdir@/libipulog/include -I@top_srcdir@/conffile +CFLAGS+=-I@top_srcdir@ -I@top_srcdir@/libipulog/include -I@top_srcdir@/include SH_CFLAGS:=$(CFLAGS) -fPIC SHARED_LIBS=ulogd_MYSQL.so diff --git a/ulogd/mysql/ulogd_MYSQL.c b/ulogd/mysql/ulogd_MYSQL.c index e7083ee..018c932 100644 --- a/ulogd/mysql/ulogd_MYSQL.c +++ b/ulogd/mysql/ulogd_MYSQL.c @@ -1,4 +1,4 @@ -/* ulogd_MYSQL.c, Version $Revision: 1.5 $ +/* ulogd_MYSQL.c, Version $Revision: 1.6 $ * * ulogd output plugin for logging to a MySQL database * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: ulogd_MYSQL.c,v 1.4 2001/05/20 13:51:46 laforge Exp $ + * $Id: ulogd_MYSQL.c,v 1.6 2001/09/01 11:52:56 laforge Exp $ * * 15 May 2001, Alex Janssen : * Added a compability option for older MySQL-servers, which @@ -34,9 +34,9 @@ #include #include #include +#include +#include #include -#include "ulogd.h" -#include "conffile.h" #ifdef DEBUG_MYSQL #define DEBUGP(x, args...) fprintf(stderr, x, ## args) diff --git a/ulogd/pcap/Makefile.in b/ulogd/pcap/Makefile.in index 9a31edb..edbdbdf 100644 --- a/ulogd/pcap/Makefile.in +++ b/ulogd/pcap/Makefile.in @@ -1,12 +1,12 @@ # - -# Normally You should not need to change anything below -# include @top_srcdir@/Rules.make -CFLAGS+=-I@top_srcdir@ -I@top_srcdir@/libipulog/include -I@top_srcdir@/conffile +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_PCAP.so all: $(SHARED_LIBS) diff --git a/ulogd/pcap/ulogd_PCAP.c b/ulogd/pcap/ulogd_PCAP.c index d7e5912..2bebcf1 100644 --- a/ulogd/pcap/ulogd_PCAP.c +++ b/ulogd/pcap/ulogd_PCAP.c @@ -20,7 +20,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: ulogd_PCAP.c,v 1.1 2002/06/13 12:55:21 laforge Exp $ + * $Id: ulogd_PCAP.c,v 1.1 2002/07/30 08:00:47 laforge Exp $ * */ @@ -32,8 +32,8 @@ #include #include #include -#include "ulogd.h" -#include "conffile.h" +#include +#include #ifndef ULOGD_PCAP_DEFAULT #define ULOGD_PCAP_DEFAULT "/var/log/ulogd.pcap" diff --git a/ulogd/pgsql/Makefile.in b/ulogd/pgsql/Makefile.in index 2f65173..c42514a 100644 --- a/ulogd/pgsql/Makefile.in +++ b/ulogd/pgsql/Makefile.in @@ -4,7 +4,7 @@ # include @top_srcdir@/Rules.make -CFLAGS+=-I@top_srcdir@ -I@top_srcdir@/libipulog/include -I@top_srcdir@/conffile +CFLAGS+=-I@top_srcdir@ -I@top_srcdir@/libipulog/include -I@top_srcdir@/include SH_CFLAGS:=$(CFLAGS) -fPIC SHARED_LIBS=ulogd_PGSQL.so diff --git a/ulogd/pgsql/ulogd_PGSQL.c b/ulogd/pgsql/ulogd_PGSQL.c index 01c7b92..87b8b68 100644 --- a/ulogd/pgsql/ulogd_PGSQL.c +++ b/ulogd/pgsql/ulogd_PGSQL.c @@ -12,10 +12,9 @@ #include #include -#include +#include +#include #include -#include "ulogd.h" -#include "conffile.h" #ifdef DEBUG_PGSQL diff --git a/ulogd/ulogd.c b/ulogd/ulogd.c index 9e399ee..201a88a 100644 --- a/ulogd/ulogd.c +++ b/ulogd/ulogd.c @@ -1,6 +1,6 @@ -/* ulogd, Version $Revision: 1.27 $ +/* ulogd, Version $Revision: 1.28 $ * - * $Id: ulogd.c,v 1.27 2002/07/30 07:15:54 laforge Exp $ + * $Id: ulogd.c,v 1.28 2002/07/30 07:23:36 laforge Exp $ * * userspace logging daemon for the netfilter ULOG target * of the linux 2.4 netfilter subsystem. @@ -20,7 +20,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: ulogd.c,v 1.27 2002/07/30 07:15:54 laforge Exp $ + * $Id: ulogd.c,v 1.28 2002/07/30 07:23:36 laforge Exp $ * * Modifications: * 14 Jun 2001 Martin Josefsson @@ -45,8 +45,8 @@ #include #include #include -#include "conffile.h" -#include "ulogd.h" +#include +#include /* Size of the netlink receive buffer. If you have _big_ in-kernel * queues, you may have to increase this number. -- cgit v1.2.3