html_targets and man_targets not working out so hot

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a81280117c3f428fc7a232522ce0620878b43d54..492b611ffe223dd3682dc7b2226cae5d5e98ad27 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,8 +3,8 @@ SGML = drivers.sgml funcref.sgml glossary.sgml \
        install.sgml intro.sgml other.sgml reference.sgml tutorial.sgml \
        driverwriting.sgml comedilib.sgml
 
-EXTRA_DIST = $(SGML) funcref mkref drivers.txt mkdr FAQ $(all_html) $(all_man) \
-       comedilib.pdf acq-seq.gif html_targets man_targets
+EXTRA_DIST = $(SGML) funcref mkref drivers.txt mkdr FAQ \
+       comedilib.pdf acq-seq.gif html man
 
 BUILT_SOURCES = funcref.sgml drivers.sgml
 
@@ -15,7 +15,7 @@ pkgdata_DATA =
 endif
 
 if HAVE_DOCBOOK2HTML
-all_html = $(shell cat html_targets)
+all_html = html
 install_html = install_html
 uninstall_html = uninstall_html
 else
@@ -25,7 +25,7 @@ uninstall_html =
 endif
 
 if HAVE_DOCBOOK2MAN
-all_man = $(shell cat man_targets)
+all_man = man
 install_man = install_man
 uninstall_man = uninstall_man
 else
@@ -40,9 +40,8 @@ install-data-local: $(install_html) $(install_man)
 
 uninstall-local: $(uninstall_html) $(uninstall_man)
 
-html/%.html: $(SGML)
+html: $(SGML)
        { $(DOCBOOK2HTML) -o html $(srcdir)/comedilib.sgml && touch html; } || { $(RM) -r html; exit 1; }
-       $(MAKE) html_targets
 
 install_html:
        $(INSTALL) -d $(pkgdatadir)/html
@@ -53,9 +52,8 @@ uninstall_html:
        for each in $(srcdir)/html/*.html $(srcdir)/*.gif ; do \
                $(RM) $(pkgdatadir)/html/`basename $$each` ; done
 
-man/%: $(SGML)
+man: $(SGML)
        { $(DOCBOOK2MAN) -o man $(srcdir)/comedilib.sgml && touch man; } || { $(RM) -r man; exit 1; }
-       $(MAKE) man_targets
 
 install_man:
        $(INSTALL) -d $(mandir)/man3
@@ -77,14 +75,6 @@ maintainer-clean-local:
        $(RM) -r html man
        $(RM) comedilib.pdf
 
-.PHONY: html_targets man_targets
-
-html_targets:
-       ls html/*.html > html_targets
-
-man_targets:
-       ls man/*.3 > man_targets
-
 locales = de
 
 messages: .phony

diff --git a/doc/html_targets b/doc/html_targets
deleted file mode 100644 (file)
index 44cc200..0000000
--- a/doc/html_targets
+++ /dev/null
@@ -1,70 +0,0 @@
-html/acquisitionfunctions.html
-html/comedilib-glossary.html
-html/comedireference.html
-html/driverwriting.html
-html/func-ref-comedi-apply-calibration.html
-html/func-ref-comedi-apply-parsed-calibration.html
-html/func-ref-comedi-cancel.html
-html/func-ref-comedi-cleanup-calibration-file.html
-html/func-ref-comedi-close.html
-html/func-ref-comedi-command-test.html
-html/func-ref-comedi-command.html
-html/func-ref-comedi-data-read-delayed.html
-html/func-ref-comedi-data-read-hint.html
-html/func-ref-comedi-data-read.html
-html/func-ref-comedi-data-write.html
-html/func-ref-comedi-dio-bitfield.html
-html/func-ref-comedi-dio-config.html
-html/func-ref-comedi-dio-read.html
-html/func-ref-comedi-dio-write.html
-html/func-ref-comedi-do-insn.html
-html/func-ref-comedi-do-insnlist.html
-html/func-ref-comedi-errno.html
-html/func-ref-comedi-fileno.html
-html/func-ref-comedi-find-range.html
-html/func-ref-comedi-find-subdevice-by-type.html
-html/func-ref-comedi-from-phys.html
-html/func-ref-comedi-get-board-name.html
-html/func-ref-comedi-get-buffer-contents.html
-html/func-ref-comedi-get-buffer-offset.html
-html/func-ref-comedi-get-buffer-size.html
-html/func-ref-comedi-get-cmd-generic-timed.html
-html/func-ref-comedi-get-cmd-src-mask.html
-html/func-ref-comedi-get-default-calibration-path.html
-html/func-ref-comedi-get-driver-name.html
-html/func-ref-comedi-get-max-buffer-size.html
-html/func-ref-comedi-get-maxdata.html
-html/func-ref-comedi-get-n-channels.html
-html/func-ref-comedi-get-n-ranges.html
-html/func-ref-comedi-get-n-subdevices.html
-html/func-ref-comedi-get-range.html
-html/func-ref-comedi-get-read-subdevice.html
-html/func-ref-comedi-get-subdevice-flags.html
-html/func-ref-comedi-get-subdevice-type.html
-html/func-ref-comedi-get-timer.html
-html/func-ref-comedi-get-version-code.html
-html/func-ref-comedi-get-write-subdevice.html
-html/func-ref-comedi-lock.html
-html/func-ref-comedi-loglevel.html
-html/func-ref-comedi-mark-buffer-read.html
-html/func-ref-comedi-maxdata-is-chan-specific.html
-html/func-ref-comedi-open.html
-html/func-ref-comedi-parse-calibration-file.html
-html/func-ref-comedi-perror.html
-html/func-ref-comedi-poll.html
-html/func-ref-comedi-range-is-chan-specific.html
-html/func-ref-comedi-set-buffer-size.html
-html/func-ref-comedi-set-global-oor-behavior.html
-html/func-ref-comedi-set-max-buffer-size.html
-html/func-ref-comedi-strerror.html
-html/func-ref-comedi-sv-init.html
-html/func-ref-comedi-sv-measure.html
-html/func-ref-comedi-sv-update.html
-html/func-ref-comedi-timed-1chan.html
-html/func-ref-comedi-to-phys.html
-html/func-ref-comedi-trigger.html
-html/func-ref-comedi-unlock.html
-html/index.html
-html/install.html
-html/lowleveldrivers.html
-html/writingprograms.html

diff --git a/doc/man_targets b/doc/man_targets
deleted file mode 100644 (file)
index 0cf1c27..0000000
--- a/doc/man_targets
+++ /dev/null
@@ -1,62 +0,0 @@
-man/comedi_apply_calibration.3
-man/comedi_apply_parsed_calibration.3
-man/comedi_cancel.3
-man/comedi_cleanup_calibration_file.3
-man/comedi_close.3
-man/comedi_command.3
-man/comedi_command_test.3
-man/comedi_data_read.3
-man/comedi_data_read_delayed.3
-man/comedi_data_read_hint.3
-man/comedi_data_write.3
-man/comedi_dio_bitfield.3
-man/comedi_dio_config.3
-man/comedi_dio_read.3
-man/comedi_dio_write.3
-man/comedi_do_insn.3
-man/comedi_do_insnlist.3
-man/comedi_errno.3
-man/comedi_fileno.3
-man/comedi_find_range.3
-man/comedi_find_subdevice_by_type.3
-man/comedi_from_phys.3
-man/comedi_get_board_name.3
-man/comedi_get_buffer_contents.3
-man/comedi_get_buffer_offset.3
-man/comedi_get_buffer_size.3
-man/comedi_get_cmd_generic_timed.3
-man/comedi_get_cmd_src_mask.3
-man/comedi_get_default_calibration_path.3
-man/comedi_get_driver_name.3
-man/comedi_get_max_buffer_size.3
-man/comedi_get_maxdata.3
-man/comedi_get_n_channels.3
-man/comedi_get_n_ranges.3
-man/comedi_get_n_subdevices.3
-man/comedi_get_range.3
-man/comedi_get_read_subdevice.3
-man/comedi_get_subdevice_flags.3
-man/comedi_get_subdevice_type.3
-man/comedi_get_timer.3
-man/comedi_get_version_code.3
-man/comedi_get_write_subdevice.3
-man/comedi_lock.3
-man/comedi_loglevel.3
-man/comedi_mark_buffer_read.3
-man/comedi_maxdata_is_chan_specific.3
-man/comedi_open.3
-man/comedi_parse_calibration_file.3
-man/comedi_perror.3
-man/comedi_poll.3
-man/comedi_range_is_chan_specific.3
-man/comedi_set_buffer_size.3
-man/comedi_set_global_oor_behavior.3
-man/comedi_set_max_buffer_size.3
-man/comedi_strerror.3
-man/comedi_sv_init.3
-man/comedi_sv_measure.3
-man/comedi_sv_update.3
-man/comedi_timed_1chan.3
-man/comedi_to_phys.3
-man/comedi_trigger.3
-man/comedi_unlock.3