summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org>2006-01-08 22:55:39 +0000
committer/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org>2006-01-08 22:55:39 +0000
commitea4c61fd022d4f0b46b556948e757102e28f2566 (patch)
tree75e49ca5967db609498cd75807eba3387ddc115b
parentbd867ce377abfcc52d9d9d0faf010fcd4ae0845e (diff)
further 'make dist' fixes
-rw-r--r--Makefile.am3
-rw-r--r--configure.in8
-rw-r--r--include/Makefile.am1
-rw-r--r--include/libipulog/libipulog.h (renamed from libipulog/libipulog.h)0
-rw-r--r--include/ulogd/Makefile.am2
-rw-r--r--libipulog/libipulog.c2
6 files changed, 12 insertions, 4 deletions
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/libipulog/libipulog.h b/include/libipulog/libipulog.h
index a049d27..a049d27 100644
--- a/libipulog/libipulog.h
+++ b/include/libipulog/libipulog.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 <string.h>
#include <unistd.h>
#include <net/if.h>
-#include "libipulog.h"
+#include <libipulog/libipulog.h>
struct ipulog_handle
{