distrib: fix distcheck magic

This patch fixes the `make distcheck' magic

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/Makefile.am b/Makefile.am
index 46615c15a989efa5d0dd52328ab28b9d1bd49b59..e8b1154bd3e9aab1d66713ba59321c3d279f4da9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,10 +3,10 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
 man_MANS = ulogd.8
 
-EXTRA_DIST = $(man_MANS) debian ulogd.logrotate ulogd.spec
+EXTRA_DIST = $(man_MANS) debian ulogd.logrotate ulogd.spec ulogd.conf.in doc
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
-SUBDIRS = include doc libipulog src input filter output
+SUBDIRS = include libipulog src input filter output
 
 noinst_DATA = ulogd.conf
 
@@ -20,3 +20,6 @@ $(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
+dist-hook:
+       rm -f ulogd.conf
+

diff --git a/configure.in b/configure.in
index 88895756a783f7621dac847987663277f1a76c43..0e173a35bb2f8f6f505c3d7291a35e6aead08fdb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -70,8 +70,7 @@ 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 \
-         include/Makefile include/ulogd/Makefile include/libipulog/Makefile \
+AC_OUTPUT(include/Makefile include/ulogd/Makefile include/libipulog/Makefile \
          libipulog/Makefile \
          input/Makefile input/packet/Makefile input/flow/Makefile \
          filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \

diff --git a/doc/Makefile.am b/doc/Makefile
similarity index 54%
rename from doc/Makefile.am
rename to doc/Makefile
index a80373a7a0d3ea1318cf87ea81f86e0e5174e6da..8ccb9ad64d411f0d11a7cdec9e7bf6df03b86d32 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile
@@ -1,10 +1,7 @@
-
-EXTRA_DIST = ulogd.txt ulogd.html ulogd.ps \
-            sqlite3.table pgsql-ulogd2.sql mysql-ulogd2.sql
-
-dist-hook:
+all:
        sgml2txt ulogd.sgml
        sgml2latex --papersize=a4 --output=dvi ulogd.sgml
        dvips -t a4 -o ulogd.ps ulogd.dvi
        sgml2html -s 0 ulogd.sgml
-
+clean:
+       rm -f ulogd.dvi ulogd.txt ulogd.html ulogd.ps

diff --git a/include/ulogd/Makefile.am b/include/ulogd/Makefile.am
index cd01fc007b26aef2f5d6e372fb6e99911fb88fe7..9b8a3d12d5f11eebe4a181a44abb53ad9b3122d5 100644 (file)
--- a/include/ulogd/Makefile.am
+++ b/include/ulogd/Makefile.am
@@ -1,2 +1,2 @@
 
-noinst_HEADERS = conffile.h db.h ipfix_protocol.h linuxlist.h ulogd.h printpkt.h printflow.h common.h linux_rbtree.h timer.h
+noinst_HEADERS = conffile.h db.h ipfix_protocol.h linuxlist.h ulogd.h printpkt.h printflow.h common.h linux_rbtree.h timer.h slist.h hash.h jhash.h