fix include paths.

diff --git a/Makefile.in b/Makefile.in
index 598ebcbac8645e8eae397409cd6aa9c1c6d0864d..a7d01e1a94b84d360800d7995639c47f111f8ae5 100644 (file)
--- a/Makefile.in
+++ b/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/conffile/Makefile.in b/conffile/Makefile.in
index 85b973395f0ecc03b345b269e6ec09c8ecf2cea2..907e6a7ca651b759f1682456d48c6605901e952b 100644 (file)
--- a/conffile/Makefile.in
+++ b/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/extensions/Makefile.in b/extensions/Makefile.in
index 4ec35b4e19cbeff520f619b0d4b6bc03d3f514ca..b25baea11561a82fec7791f37740c01990922693 100644 (file)
--- a/extensions/Makefile.in
+++ b/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/extensions/ulogd_BASE.c b/extensions/ulogd_BASE.c
index 180370b8e76ea27b145af9a54e314ec1b022a079..d86ec940f80b3e2922515c8af074759e6a630eb1 100644 (file)
--- a/extensions/ulogd_BASE.c
+++ b/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 <stdio.h>
 #include <stdlib.h>
-#include <ulogd.h>
 #include <linux/ip.h>
 #include <linux/in.h>
 #include <linux/tcp.h>
 #include <linux/icmp.h>
 #include <linux/udp.h>
+#include <ulogd/ulogd.h>
 
 /***********************************************************************
  *                     Raw header

diff --git a/extensions/ulogd_LOCAL.c b/extensions/ulogd_LOCAL.c
index 3ecf2b56f4484189d7043d7f7da5a8e9e9e65140..e396cf526d41419716540a54113e69ea39d6073d 100644 (file)
--- a/extensions/ulogd_LOCAL.c
+++ b/extensions/ulogd_LOCAL.c
@@ -27,8 +27,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ulogd.h>
 #include <string.h>
+#include <ulogd/ulogd.h>
 
 #ifdef DEBUG_LOCAL
 #define DEBUGP(x) ulogd_log(ULOGD_DEBUG, x)

diff --git a/extensions/ulogd_LOGEMU.c b/extensions/ulogd_LOGEMU.c
index 4faf95f940af6a3936bb73de4b5202c4f596e4c4..c31708f8c2d3a8341f762893aff476d677f7fc97 100644 (file)
--- a/extensions/ulogd_LOGEMU.c
+++ b/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 <sys/time.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
-#include "ulogd.h"
-#include "conffile.h"
+#include <ulogd/ulogd.h>
+#include <ulogd/conffile.h>
 
 #ifndef ULOGD_LOGEMU_DEFAULT
 #define ULOGD_LOGEMU_DEFAULT   "/var/log/ulogd.syslogemu"

diff --git a/extensions/ulogd_OPRINT.c b/extensions/ulogd_OPRINT.c
index 8195bf09a9b8aa015b40f7c042850be5fa7fb9b2..7ff5e76742cd8a7c78a67f342a344daf74e96ee1 100644 (file)
--- a/extensions/ulogd_OPRINT.c
+++ b/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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ulogd.h"
-#include "conffile.h"
+#include <ulogd/ulogd.h>
+#include <ulogd/conffile.h>
 
 #ifndef ULOGD_OPRINT_DEFAULT
 #define ULOGD_OPRINT_DEFAULT   "/var/log/ulogd.pktlog"

diff --git a/extensions/ulogd_PWSNIFF.c b/extensions/ulogd_PWSNIFF.c
index 4d0d85b07adc2b9e39f7ac01d4ff48702e45efa5..0adf3d6f0e6004f017a6bb4981199e15d4e8ba19 100644 (file)
--- a/extensions/ulogd_PWSNIFF.c
+++ b/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 <stdio.h>
 #include <stdlib.h>
-#include <ulogd.h>
 #include <string.h>
 #include <linux/ip.h>
 #include <linux/in.h>
 #include <linux/tcp.h>
+#include <ulogd/ulogd.h>
 
 #ifdef DEBUG_PWSNIFF
 #define DEBUGP(x) ulogd_log(ULOGD_DEBUG, x)

diff --git a/mysql/Makefile.in b/mysql/Makefile.in
index 0376c83237750cb3093c0d92279b821954f1ff51..7e4184b315128cb93c0c46fcb3b45be50ceb1a87 100644 (file)
--- a/mysql/Makefile.in
+++ b/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/mysql/ulogd_MYSQL.c b/mysql/ulogd_MYSQL.c
index e7083ee4e4b2ae48a387bc83e52517a066eee423..018c932af9d67f7d2d98f8271db0bf2015b11f8e 100644 (file)
--- a/mysql/ulogd_MYSQL.c
+++ b/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 <alex@ynfonatic.de>:
  *      Added a compability option for older MySQL-servers, which
@@ -34,9 +34,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ulogd.h>
+#include <ulogd/ulogd.h>
+#include <ulogd/conffile.h>
 #include <mysql/mysql.h>
-#include "ulogd.h"
-#include "conffile.h"
 
 #ifdef DEBUG_MYSQL
 #define DEBUGP(x, args...)     fprintf(stderr, x, ## args)

diff --git a/pcap/Makefile.in b/pcap/Makefile.in
index 9a31edb39f033ab489886a890766dc7852b2ba64..edbdbdf3f35da644cb4429a108056896cf9df5b8 100644 (file)
--- a/pcap/Makefile.in
+++ b/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/pcap/ulogd_PCAP.c b/pcap/ulogd_PCAP.c
index d7e5912624ff23a36fcb33cff2fd6539583c7941..2bebcf1c7bd40e65fb3ce677a42bd3e231e30afc 100644 (file)
--- a/pcap/ulogd_PCAP.c
+++ b/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 <sys/time.h>
 #include <sys/stat.h>
 #include <pcap.h>
-#include "ulogd.h"
-#include "conffile.h"
+#include <ulogd/ulogd.h>
+#include <ulogd/conffile.h>
 
 #ifndef ULOGD_PCAP_DEFAULT
 #define ULOGD_PCAP_DEFAULT     "/var/log/ulogd.pcap"

diff --git a/pgsql/Makefile.in b/pgsql/Makefile.in
index 2f65173af5db9d94510d7f421be6dc927d5b656a..c42514a79f6b8eee6d4c3b03d57d9cf9c5a6f6c5 100644 (file)
--- a/pgsql/Makefile.in
+++ b/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/pgsql/ulogd_PGSQL.c b/pgsql/ulogd_PGSQL.c
index 01c7b92182c3155e7ac8d1d1f8dcaea1bfe1bdd6..87b8b68c3147df80a71b6141d9560ab00165e416 100644 (file)
--- a/pgsql/ulogd_PGSQL.c
+++ b/pgsql/ulogd_PGSQL.c
@@ -12,10 +12,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <ulogd.h>
+#include <ulogd/ulogd.h>
+#include <ulogd/conffile.h>
 #include <libpq-fe.h>
-#include "ulogd.h"
-#include "conffile.h"
 
 
 #ifdef DEBUG_PGSQL

diff --git a/ulogd.c b/ulogd.c
index 9e399eef99ec6f0aa8a1680af3cec71f942ce3bc..201a88abcd2d181cc3f86b58b072edfdb6b4ea74 100644 (file)
--- a/ulogd.c
+++ b/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 <gandalf@wlug.westbo.se>
@@ -45,8 +45,8 @@
 #include <dirent.h>
 #include <getopt.h>
 #include <libipulog/libipulog.h>
-#include "conffile.h"
-#include "ulogd.h"
+#include <ulogd/conffile.h>
+#include <ulogd/ulogd.h>
 
 /* Size of the netlink receive buffer. If you have _big_ in-kernel
  * queues, you may have to increase this number.