Changeset 14651

Timestamp:

11/18/12 18:14:40 (12 years ago)

Author:

tbretz

Message:

Do doxygen-run instead of doxygen-doc; don't add jsdoc to targts.

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (4 diffs)

trunk/FACT++/Makefile.am

@@ -538 +538 @@
 
 if HAS_JSDOC
-MAN_TARGETS += jsdoc
+JAVA_SCRIPT_DOC=jsdoc
 endif
 
@@ -556 +556 @@
 
 
-man: $(MAN_TARGETS) doxygen-doc
+man: $(MAN_TARGETS) $(JAVA_SCRIPT_DOC) doxygen-run
 
 diff:

trunk/FACT++/Makefile.in

@@ -86 +86 @@
 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_16 = $(dist_man1_MANS:.man=.pdf)
 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_17 = $(dist_man1_MANS:.man=.pdf)
-@HAS_JSDOC_TRUE@am__append_18 = jsdoc
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -1138 +1137 @@
 
 #-------------------------------------------------------------------------
-MAN_TARGETS = $(dist_man1_MANS) $(am__append_12) $(am__append_15) \
-        $(am__append_18)
+MAN_TARGETS = $(dist_man1_MANS) $(am__append_12) $(am__append_15)
+@HAS_JSDOC_TRUE@JAVA_SCRIPT_DOC = jsdoc
 all: $(BUILT_SOURCES)
         $(MAKE) $(AM_MAKEFLAGS) all-am
@@ -2768 +2767 @@
 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@            $(DX_PDFLATEX) refman.tex; \
 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@            countdown=`expr $$countdown - 1`; \
-@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@            done; \
-@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    mv refman.pdf ../@PACKAGE@.pdf
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@            done;
 
 @DX_COND_doc_TRUE@.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL)
@@ -2806 +2804 @@
         $(AM_V_GEN)jsdoc -r=2 -d=www/dimctrl scripts | grep -v ^java
 
-man: $(MAN_TARGETS) doxygen-doc
+man: $(MAN_TARGETS) $(JAVA_SCRIPT_DOC) doxygen-run
 
 diff: