moved doc-generation to distribution-time, not compile-time

diff --git a/Makefile.in b/Makefile.in
index ec93a5bcaa557f597a51d2fd84b534dda6f582c6..4a7140688045fc9de9533aa38d5da456b4a3004d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,6 +14,10 @@ endif
 
 all: recurse ulogd
 
+distrib:
+       @for d in $(SUBDIRS); do if ! make -C $$d distrib; then exit 1; fi; done
+       @make distclean
+
 recurse: 
        @for d in $(SUBDIRS); do if ! make -C $$d; then exit 1; fi; done
 
@@ -27,7 +31,7 @@ clean:
 
 distclean: clean
        @for d in $(SUBDIRS); do if ! make -C $$d $@; then exit 1; fi; done
-       rm -f Makefile config.cache config.log config.status Rules.make configure
+       rm -f Makefile config.cache config.log config.status Rules.make
 
 install: all
        @for d in $(SUBDIRS); do if ! make -C $$d $@; then exit 1; fi; done

diff --git a/conffile/Makefile.in b/conffile/Makefile.in
index 746a46b3fc8064b91d14d35846204f85878bac10..85b973395f0ecc03b345b269e6ec09c8ecf2cea2 100644 (file)
--- a/conffile/Makefile.in
+++ b/conffile/Makefile.in
@@ -6,6 +6,8 @@ include @top_srcdir@/Rules.make
 
 all: conffile.o
 
+distrib:
+
 conffile.o: conffile.c
        $(CC) $(CFLAGS) -c $< -o $@
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index fd7b711df6dfcb898d3079313df0f6b48d0d25d1..e6c71a954a63d8fe34d978b4de7d0f9cff53f8ba 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,5 @@
 #! /usr/bin/make
+# this file is shamelessly stolen from the iptables CVS tree
 
 LANG_DIRS:=
 
@@ -13,7 +14,9 @@ PSUS_HOWTOS:=$(HOWTOS:.sgml=.letter.ps)
 HOWTO_FLAGS_it/=-c latin -l it
 HOWTO_FLAGS_fr/=-c latin -l fr
 
-interesting_howtos: $(TXT_HOWTOS) $(PSA4_HOWTOS)
+user_calls_make:
+
+distrib: $(TXT_HOWTOS) $(PSA4_HOWTOS) $(HTML_HOWTOS)
 
 HOWTOs: $(TXT_HOWTOS) $(HTML_HOWTOS) $(PSA4_HOWTOS) $(PSUS_HOWTOS)
 
@@ -37,10 +40,10 @@ $(TXT_HOWTOS) $(HTML_HOWTOS) $(PSA4_HOWTOS) $(PSUS_HOWTOS): Makefile
        @dvips -t letter -o $@ $< 
 
 %.html: %.sgml
-       @echo Making $@: && cd `dirname $<` && sgml2html $(HOWTO_FLAGS_$(dir $<)) `basename $<` 2>&1 | sed "s?^<standard input>:\([0-9]*\):[^ ]* ?$<:\1:?"
+       @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
+#      for d in . $(LANG_DIRS); do rm -f $$d/*.html $$d/*.ps $$d/*.aux $$d/*.log $$d/*.txt $$d/*~; done
 
 distclean:
        rm -f Makefile

diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index f89312a26c5375a2960bb63be6af4dd510321c3a..9c7e9eba7ff3d6e5f7e7707d178f4af8ede20eda 100644 (file)
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -9,8 +9,11 @@ SH_CFLAGS:=$(CFLAGS) -fPIC
 
 SHARED_LIBS+=$(foreach T,$(ULOGD_SL),ulogd_$(T).so)
 
+
 all: $(SHARED_LIBS)
 
+distrib:
+
 $(SHARED_LIBS): %.so: %_sh.o
        ld -shared -o $@ $<
 

diff --git a/libipulog/Makefile.in b/libipulog/Makefile.in
index 973c63e3c66a7c5f66715e13bc0622314c6ef815..f5e416e8236d69fd368435afc2b675fbe3afd9fa 100644 (file)
--- a/libipulog/Makefile.in
+++ b/libipulog/Makefile.in
@@ -6,6 +6,8 @@ CFLAGS+=-Iinclude -I/usr/src/linux/include
 libipulog.a: libipulog.o
        ld -i $< -o $@
 
+distrib:
+
 ulog_test: ulog_test.c libipulog.a
        $(CC) $(CFLAGS) ulog_test.c libipulog.a -o ulog_test
 

diff --git a/mysql/Makefile.in b/mysql/Makefile.in
index 49e1f878f61f6667be44684adeb883893dfdbb12..e716bb3dbd7452045305e385d942b60405c54970 100644 (file)
--- a/mysql/Makefile.in
+++ b/mysql/Makefile.in
@@ -11,6 +11,8 @@ SHARED_LIBS=ulogd_MYSQL.so
 
 all: $(SHARED_LIBS)
 
+distrib:
+
 $(SHARED_LIBS): %.so: %_sh.o
        ld -shared $(MYSQL_LDFLAGS) -o $@ $<