further 'make dist' fixes

diff --git a/Makefile.am b/Makefile.am
index 677fe2c94a9c7e1c9f781b5758a1f16048136555..f4e9e4d540a7f88974b75dfbf58cbe590b5c9e93 100644 (file)
--- 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 e971e7d46100c067b0d7742f58f88632ae39184a..be28e1f0dcf0581a54512e8310b67a8c796e0435 100644 (file)
--- 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 (file)
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
similarity index 100%
rename from libipulog/libipulog.h
rename to include/libipulog/libipulog.h

diff --git a/include/ulogd/Makefile.am b/include/ulogd/Makefile.am
new file mode 100644 (file)
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 6d2ade04d43c3612427728ef2387cd3fb8a474bd..8917bcc5d5c9ff05a2bdf7b1c82e118d47bd36d8 100644 (file)
--- 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
 {