fix doc building

diff --git a/Makefile.am b/Makefile.am
index c8e5273beafaf0e36fe11c695cace66454338a6b..677fe2c94a9c7e1c9f781b5758a1f16048136555 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,8 @@ man_MANS = ulogd.8
 EXTRA_DIST = $(man_MANS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
-SUBDIRS = libipulog src input filter output
-DIST_SUBDIRS = src input filter output
+SUBDIRS = doc libipulog src input filter output
+DIST_SUBDIRS = doc src input filter output
 
 $(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)

diff --git a/configure.in b/configure.in
index 5de1b3ba96e3b3ebb42c16924d76ecc2cd1dba87..e971e7d46100c067b0d7742f58f88632ae39184a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT
 
-AM_INIT_AUTOMAKE(ulogd, 2.0.0beta)
+AM_INIT_AUTOMAKE(ulogd, 2.0.0beta1)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.

diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644 (file)
index 0000000..1f2ad90
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,10 @@
+
+EXTRA_DIST = ulogd.txt ulogd.html ulogd.ps \
+       mysql.table pgsql.table sqlite3.table mysql.table.ipaddr-as-string
+
+dist-hook:
+       sgml2txt ulogd.sgml
+       sgml2latex --papersize=a4 --output=dvi ulogd.sgml
+       dvips -t a4 -o ulogd.ps ulogd.dvi
+       sgml2html -s 0 ulogd.sgml
+

diff --git a/doc/Makefile.in b/doc/Makefile.in
deleted file mode 100644 (file)
index e6c71a9..0000000
--- a/doc/Makefile.in
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /usr/bin/make
-# this file is shamelessly stolen from the iptables CVS tree
-
-LANG_DIRS:=
-
-HOWTOS:=$(wildcard *.sgml)
-HOWTOS+=$(foreach dir, $(LANG_DIRS), $(wildcard $(dir)/*.sgml))
-
-TXT_HOWTOS:=$(HOWTOS:.sgml=.txt)
-HTML_HOWTOS:=$(HOWTOS:.sgml=.html)
-PSA4_HOWTOS:=$(HOWTOS:.sgml=.a4.ps)
-PSUS_HOWTOS:=$(HOWTOS:.sgml=.letter.ps)
-
-HOWTO_FLAGS_it/=-c latin -l it
-HOWTO_FLAGS_fr/=-c latin -l fr
-
-user_calls_make:
-
-distrib: $(TXT_HOWTOS) $(PSA4_HOWTOS) $(HTML_HOWTOS)
-
-HOWTOs: $(TXT_HOWTOS) $(HTML_HOWTOS) $(PSA4_HOWTOS) $(PSUS_HOWTOS)
-
-# Remake all if Makefile changes.
-$(TXT_HOWTOS) $(HTML_HOWTOS) $(PSA4_HOWTOS) $(PSUS_HOWTOS): Makefile
-
-# Stupid sgml2* tools strip dirnames for output files. 8(
-%.txt: %.sgml
-       @echo Making $@: && cd `dirname $<` && sgml2txt --filter $(HOWTO_FLAGS_$(dir $<)) `basename $<` 2>&1 | sed "s?^<standard input>:\([0-9]*\):[^ ]* ?$<:\1:?"
-
-%.a4.dvi: %.sgml
-       @echo Making $@: && cd `dirname $<` && sgml2latex --papersize=a4 --output=dvi $(HOWTO_FLAGS_$(dir $<)) `basename $<` 2>&1 | sed "s?^<standard input>:\([0-9]*\):[^ ]* ?$<:\1:?" && mv `basename $*.dvi` `basename $*.a4.dvi`
-
-%.a4.ps: %.a4.dvi
-       @dvips -t a4 -o $@ $< 
-
-%.letter.dvi: %.sgml
-       @echo Making $@: && cd `dirname $<` && sgml2latex --papersize=letter --output=dvi $(HOWTO_FLAGS_$(dir $<)) `basename $<` 2>&1 | sed "s?^<standard input>:\([0-9]*\):[^ ]* ?$<:\1:?" && mv `basename $*.dvi` `basename $*.letter.dvi`
-
-%.letter.ps: %.letter.dvi
-       @dvips -t letter -o $@ $< 
-
-%.html: %.sgml
-       @echo Making $@: && cd `dirname $<` && sgml2html -s 0 $(HOWTO_FLAGS_$(dir $<)) `basename $<` 2>&1 | sed "s?^<standard input>:\([0-9]*\):[^ ]* ?$<:\1:?"
-
-clean:
-#      for d in . $(LANG_DIRS); do rm -f $$d/*.html $$d/*.ps $$d/*.aux $$d/*.log $$d/*.txt $$d/*~; done
-
-distclean:
-       rm -f Makefile
-
-install: