summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@oarcorp.com>2013-02-25 11:55:45 -0600
committerJoel Sherrill <joel.sherrill@oarcorp.com>2013-02-26 08:03:58 -0600
commite0bf7870360a0b717a71e04e6f3a6a7a4b310919 (patch)
tree3333d7d4dec5ca60471c47374776c741919239d6 /doc
parentdoc: Update copyright year in common files (diff)
downloadrtems-e0bf7870360a0b717a71e04e6f3a6a7a4b310919.tar.bz2
doc/project.am: Make texi2html and texi2any stanzas share
Diffstat (limited to '')
-rw-r--r--doc/project.am22
1 files changed, 5 insertions, 17 deletions
diff --git a/doc/project.am b/doc/project.am
index 623394856c..b84ca3a288 100644
--- a/doc/project.am
+++ b/doc/project.am
@@ -42,33 +42,21 @@ SUFFIXES += .html
if USE_HTML
-<<<<<<< HEAD
-html_project_DATA =
-=======
html_project_DATA =
+
MOSTLYCLEANFILES += $(PROJECT)*.html
html_project_DATA += *.html
->>>>>>> bdf959d... doc/project.am: Fix whitespace at EOL
-if USE_TEXI2HTML
-index.html *.html: $(PROJECT).texi $($(PROJECT)_TEXINFOS)
+# Share as much as possible between the texi2html and texi2any rules
+*.html: $(PROJECT).texi $($(PROJECT)_TEXINFOS)
rm -rf $(PROJECT).html
+if USE_TEXI2HTML
$(TEXI2HTML) $(TEXI2HTML_ARGS) --menu $< $<
-rm -rf $(PROJECT)
-
-MOSTLYCLEANFILES += $(PROJECT)*.html
-
-html_project_DATA += *.html
endif # USE_TEXI2HTML
-
if USE_TEXI2ANY
-index.html *.html: $(PROJECT).texi $($(PROJECT)_TEXINFOS)
- rm -rf $(PROJECT).html
$(TEXI2ANY) $(TEXI2ANY_ARGS) $<
-
-MOSTLYCLEANFILES += $(PROJECT)/*.html
-
-html_project_DATA += *.html
+ -rm -rf $(PROJECT)
endif # USE_TEXI2ANY
endif # USE_HTML