diff options
author | trutkin <trutkin@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2003-08-17 22:34:12 +0000 |
---|---|---|
committer | trutkin <trutkin@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2003-08-17 22:34:12 +0000 |
commit | 754c97b28ad438e290b91d23852acfda05a13f5b (patch) | |
tree | 24c1612a08144088fffb7c8300c15f22df902965 /doc | |
parent | 94214de5b6632b80b6b2cb2aaf7cca7cefc287f1 (diff) | |
download | jack1-754c97b28ad438e290b91d23852acfda05a13f5b.tar.gz |
Patches from Bob Ham, Fons Adriaensen, and Takashi Iwai
git-svn-id: svn+ssh://jackaudio.org/trunk/jack@454 0c269be4-1314-0410-8aa9-9f06e86f4224
Diffstat (limited to 'doc')
-rw-r--r-- | doc/.cvsignore | 3 | ||||
-rw-r--r-- | doc/Makefile.am | 28 | ||||
-rw-r--r-- | doc/reference.doxygen.in | 2 |
3 files changed, 17 insertions, 16 deletions
diff --git a/doc/.cvsignore b/doc/.cvsignore index c2f9a20..d4a0b58 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -1,5 +1,6 @@ Makefile Makefile.in doxygen-build.stamp -reference reference.doxygen +html +latex diff --git a/doc/Makefile.am b/doc/Makefile.am index 44e8f26..274c6a2 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,7 +6,7 @@ DOX=reference.doxygen EXTRA_DIST= -INSTIMAGES=reference/html/doxygen.png reference/html/fsm.png +INSTIMAGES=html/doxygen.png /html/fsm.png DOC_STAMPS=html-build.stamp @@ -25,36 +25,36 @@ clean-local: distclean-local: clean rm -f *.stamp || true - if test -d reference; then rm -rf reference; fi + if test -d html; then rm -rf html; fi + if test -d latex; then rm -rf latex; fi install-data-local: - $(mkinstalldirs) $(DESTDIR)$(DOC_DIR)/reference/html - (installfiles=`echo reference/html/*.html`; \ - if test "$$installfiles" = 'reference/html/*.html'; \ + $(mkinstalldirs) $(DESTDIR)$(DOC_DIR)/html + (installfiles=`echo html/*.html`; \ + if test "$$installfiles" = 'html/*.html'; \ then echo '-- Nothing to install' ; \ else \ - for i in $$installfiles $(INSTIMAGES) reference/html/doxygen.css; do \ + for i in $$installfiles $(INSTIMAGES) html/doxygen.css; do \ echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/reference/html; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/html; \ done; \ fi) # we need doxygen stuff built so we can know what to uninstall uninstall-local: doxygen-build.stamp - (installfiles=`echo reference/html/*.html`; \ - if test "$$installfiles" = 'reference/html/*.html'; \ + (installfiles=`echo html/*.html`; \ + if test "$$installfiles" = 'html/*.html'; \ then echo '-- Nothing to uninstall' ; \ else \ - for i in $$installfiles $(INSTIMAGES) reference/html/doxygen.css; do \ + for i in $$installfiles $(INSTIMAGES) html/doxygen.css; do \ echo '-- Unstalling '$$i ; \ rm $(DESTDIR)$(DOC_DIR)/$$i; \ done; \ fi) dist-hook: dist-hook-local - mkdir $(distdir)/reference - mkdir $(distdir)/reference/html - -cp reference/html/*.html reference/html/*.css \ - reference/html/*.png $(distdir)/reference/html + mkdir $(distdir)/html + -cp html/*.html html/*.css \ + html/*.png $(distdir)/html .PHONY : dist-hook-local diff --git a/doc/reference.doxygen.in b/doc/reference.doxygen.in index c8e4a3f..eabb10b 100644 --- a/doc/reference.doxygen.in +++ b/doc/reference.doxygen.in @@ -30,7 +30,7 @@ PROJECT_NUMBER = @JACK_VERSION@ # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = reference +OUTPUT_DIRECTORY = # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this |