diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2008-08-15 21:44:22 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2008-08-15 21:44:22 +0200 |
| commit | 96083f79eef9fb9c134f30b529362b6004b72328 (patch) | |
| tree | 16c0bc6a7941c2aa25d0fb48c17c744e5c5f9a02 | |
| parent | d8a1b8d30e31b3e06376005f832b71df2eef6399 (diff) | |
distrib: fix distcheck magiculogd-2.0.0beta2
This patch fixes the `make distcheck' magic
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | doc/Makefile (renamed from doc/Makefile.am) | 9 | ||||
| -rw-r--r-- | include/ulogd/Makefile.am | 2 |
4 files changed, 10 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 46615c1..e8b1154 100644 --- 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 8889575..0e173a3 100644 --- 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 index a80373a..8ccb9ad 100644 --- 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 cd01fc0..9b8a3d1 100644 --- 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 |