provide prebuilt docs in distribution tarballs

diff --git a/configure.ac b/configure.ac
index 10959f9dabda87f9aa346a2a0068eeb049e4ab9f..81a9f30ef60aa3c64bf8143d5641703c1528fb06 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -77,8 +77,6 @@ etc/hotplug/Makefile
 etc/hotplug/usb/Makefile
 etc/hotplug/usb/usbdux/Makefile
 doc/Makefile
-doc/html/Makefile
-doc/man/Makefile
 demo/Makefile
 include/Makefile
 lib/Makefile

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a84e34ca51eb26ec8d0412c8c1cb50363e0df188..bec0e4cc6ac7bb0907f5be3b2c8b32c1149243b6 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,13 +1,11 @@
 
-SUBDIRS = . html man
-
-SGML= drivers.sgml funcref.sgml glossary.sgml \
+SGML = drivers.sgml funcref.sgml glossary.sgml \
        install.sgml intro.sgml other.sgml reference.sgml tutorial.sgml \
-       driverwriting.sgml
+       driverwriting.sgml comedilib.sgml
 
-BUILT_SOURCES = funcref.sgml drivers.sgml
+EXTRA_DIST = $(SGML) funcref mkref drivers.txt mkdr FAQ $(all_html) $(all_man) comedilib.pdf
 
-EXTRA_DIST=$(SGML) comedilib.sgml funcref mkref drivers.txt mkdr
+BUILT_SOURCES = funcref.sgml drivers.sgml
 
 if HAVE_DOCBOOK2PDF
 pkgdata_DATA = comedilib.pdf
@@ -15,9 +13,55 @@ else
 pkgdata_DATA =
 endif
 
-CLEANFILES = comedilib.pdf
+if HAVE_DOCBOOK2HTML
+all_html = $(srcdir)/html
+install_html = install_html
+uninstall_html = uninstall_html
+else
+all_html =
+install_html =
+uninstall_html =
+endif
+
+if HAVE_DOCBOOK2MAN
+all_man = $(srcdir)/man
+install_man = install_man
+uninstall_man = uninstall_man
+else
+all_man =
+install_man =
+uninstall_man =
+endif
+
+all-local: $(all_html) $(all_man)
+
+install-data-local: $(install_html) $(install_man)
+
+html: $(SGML)
+       { $(DOCBOOK2HTML) -o html $(srcdir)/comedilib.sgml && touch html; } || { $(RM) -r html; exit 1; }
+
+install_html:
+       $(INSTALL) -d $(pkgdatadir)/html
+       for each in $(srcdir)/html/*.html $(srcdir)/*.gif ; do \
+               $(INSTALL_DATA) $$each $(pkgdatadir)/html ; done
+
+uninstall-local: $(uninstall_html) $(uninstall_man)
+
+uninstall_html:
+       for each in $(srcdir)/html/*.html $(srcdir)/*.gif ; do \
+               $(RM) $(pkgdatadir)/html/`basename $$each` ; done
+
+man: $(SGML)
+       { $(DOCBOOK2MAN) -o man $(srcdir)/comedilib.sgml && touch man; } || { $(RM) -r man; exit 1; }
+
+install_man:
+       $(INSTALL) -d $(mandir)/man3
+       for each in $(srcdir)/man/*.3 ; do $(INSTALL_DATA) $$each $(mandir)/man3 ; done
+
+uninstall_man:
+       for each in $(srcdir)/man/*.3 ; do $(RM) $(mandir)/man3/`basename $$each` ; done
 
-comedilib.pdf: $(srcdir)/comedilib.sgml $(SGML)
+comedilib.pdf: $(SGML)
        $(DOCBOOK2PDF) $(srcdir)/comedilib.sgml
 
 funcref.sgml: funcref mkref
@@ -26,10 +70,9 @@ funcref.sgml: funcref mkref
 drivers.sgml: drivers.txt mkdr
        $(srcdir)/mkdr drivers.txt >drivers.sgml
 
-#touch comedilib.sgml if any of the source files have changed,
-# so subdirs know they need to regenerate files
-comedilib.sgml: $(SGML)
-       touch $(srcdir)/comedilib.sgml
+maintainer-clean-local:
+       $(RM) -r html man
+       $(RM) comedilib.pdf
 
 locales = de
 

diff --git a/doc/html/acq-seq.gif b/doc/acq-seq.gif
similarity index 100%
rename from doc/html/acq-seq.gif
rename to doc/acq-seq.gif

diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am
deleted file mode 100644 (file)
index ce796c7..0000000
--- a/doc/html/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-EXTRA_DIST = acq-seq.gif
-
-if HAVE_DOCBOOK2HTML
-all_html = $(srcdir)/dummy
-install_html = install_html
-uninstall_html = uninstall_html
-else
-all_html =
-install_html =
-uninstall_html =
-endif
-
-all-local: $(all_html)
-
-dummy: $(srcdir)/../comedilib.sgml
-       $(DOCBOOK2HTML) $(srcdir)/../comedilib.sgml
-       touch $(srcdir)/dummy
-
-install-data-local: $(install_html)
-
-install_html:
-       $(INSTALL) -d $(pkgdatadir)/html
-       for each in *.html $(srcdir)/*.gif ; do $(INSTALL_DATA) $$each $(pkgdatadir)/html ; done
-
-uninstall-local: $(uninstall_html)
-
-uninstall_html:
-       for each in *.html $(srcdir)/*.gif ; do rm $(pkgdatadir)/html/`basename $$each` ; done
-
-clean-local:
-       rm -rf *.html
-       rm -f dummy

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
deleted file mode 100644 (file)
index e62d795..0000000
--- a/doc/man/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-if HAVE_DOCBOOK2MAN
-all_man = $(srcdir)/dummy
-install_man = install_man
-uninstall_man = uninstall_man
-else
-all_man =
-install_man =
-uninstall_man =
-endif
-
-all-local: $(all_man)
-
-dummy: $(srcdir)/../comedilib.sgml
-       $(DOCBOOK2MAN) $(srcdir)/../comedilib.sgml
-       touch $(srcdir)/dummy
-
-install-data-local: $(install_man)
-
-install_man:
-       $(INSTALL) -d $(mandir)/man3
-       for each in *.3 ; do $(INSTALL_DATA) $$each $(mandir)/man3 ; done
-
-uninstall-local: $(uninstall_man)
-
-uninstall_man:
-       for each in *.3 ; do rm $(mandir)/man3/$$each ; done
-
-clean-local:
-       rm -f *.3
-       rm -f manpage.links manpage.refs
-       rm -f dummy
-