summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org>2007-06-19 14:58:35 +0000
committer/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org>2007-06-19 14:58:35 +0000
commitdfcd8bea6c50eba687b36e084319cdee513f71a8 (patch)
tree0117c67465e849ed54181dbdd6fedc1bfbffc21d
parent7ba8e3145cfd2aa486bd1598c0ce401c2dfd17f8 (diff)
- remove autogenerated libpulog/Makefile from SVN
- uncomment @DEFS@ to include compilation definitions - check for autoconf 2.50 (required by AC_SYS_LARGE_FILE)
-rw-r--r--ulogd/Rules.make.in2
-rw-r--r--ulogd/configure.in1
-rw-r--r--ulogd/libipulog/Makefile24
3 files changed, 2 insertions, 25 deletions
diff --git a/ulogd/Rules.make.in b/ulogd/Rules.make.in
index b637cfb..e9cd1fd 100644
--- a/ulogd/Rules.make.in
+++ b/ulogd/Rules.make.in
@@ -24,7 +24,7 @@ CFLAGS+=@KERNEL64_USERSPACE32@
# doesn't work for subdirs
CFLAGS+=$(INCIPULOG)
CFLAGS+=-I/lib/modules/`uname -r`/build/include
-#CFLAGS+=@DEFS@
+CFLAGS+=@DEFS@
#CFLAGS+=-g -DDEBUG -DDEBUG_MYSQL -DDEBUG_PGSQL
LIBS=@LIBS@
diff --git a/ulogd/configure.in b/ulogd/configure.in
index b76d580..f245466 100644
--- a/ulogd/configure.in
+++ b/ulogd/configure.in
@@ -1,4 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
+AC_PREQ(2.50)
AC_INIT(ulogd.c)
dnl Checks for programs.
diff --git a/ulogd/libipulog/Makefile b/ulogd/libipulog/Makefile
deleted file mode 100644
index ab4d09b..0000000
--- a/ulogd/libipulog/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated automatically from Makefile.in by configure.
-#
-
-include ../Rules.make
-CFLAGS+=-Iinclude -I/usr/src/linux/include
-
-libipulog.a: libipulog.o
- $(LD) -i $< -o $@
-
-distrib:
-
-ulog_test: ulog_test.c libipulog.a
- $(CC) $(CFLAGS) ulog_test.c libipulog.a -o ulog_test
-
-libipulog.o: libipulog.c
- $(CC) $(CFLAGS) -c $< -o $@
-
-clean:
- $(RM) ulog_test libipulog.o libipulog.a
-
-distclean: clean
- $(RM) Makefile
-
-install: libipulog.a