aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-10-06 13:19:22 +0200
committerBjörn Gustavsson <[email protected]>2011-10-06 13:23:16 +0200
commit199248be0ce5f5d147689b9608aa52e981c407ef (patch)
tree333e9992bb90dd0a282c4c2938ef2693176c81b5
parent238753cfd7887167f6ec19d7cde730b04214334d (diff)
downloadotp-199248be0ce5f5d147689b9608aa52e981c407ef.tar.gz
otp-199248be0ce5f5d147689b9608aa52e981c407ef.tar.bz2
otp-199248be0ce5f5d147689b9608aa52e981c407ef.zip
ic documentation: Support parallel make
Multiple instances of javadoc would be started at once, which is unnecessary work and could cause one or more instances to fail while creating directories. Use a stand-in file (JAVADOC-GENERATED) to ensure that only one instance of javadoc is started. Since javadoc creates directories itself, there is no need to explicitly create the $(JAVA_OUT_DIR) directory.
-rw-r--r--.gitignore3
-rw-r--r--lib/ic/doc/src/Makefile7
2 files changed, 7 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index e5f0869f27..e6920fbeca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,6 +100,9 @@ make/win32/
# Used by ic & orber & cos* applications.
IDL-GENERATED
+# Used by applications that run javadoc (e.g. ic).
+JAVADOC-GENERATED
+
# Anchored from $ERL_TOP
/bin
/config.log
diff --git a/lib/ic/doc/src/Makefile b/lib/ic/doc/src/Makefile
index 8eda436a24..f255183e1f 100644
--- a/lib/ic/doc/src/Makefile
+++ b/lib/ic/doc/src/Makefile
@@ -253,14 +253,15 @@ clean clean_docs clean_tex:
rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
rm -f errs core *~ *xmls_output *xmls_errs $(LATEX_CLEAN)
rm -rf $(JAVA_OUT_DIR)
+ rm -f JAVADOC-GENERATED
endif
-$(JAVA_OUT_DIR):
- mkdir $(JAVA_OUT_DIR)
+$(JAVADOC_GENERATED_FILES): JAVADOC-GENERATED
-$(JAVADOC_GENERATED_FILES): $(JAVA_OUT_DIR)
+JAVADOC-GENERATED: $(JAVA_SOURCE_FILES:%=$(JAVA_SOURCE_DIR)/%)
@(cd ../../java_src; $(JAVADOC) $(JAVADOCFLAGS) com.ericsson.otp.ic)
+ >JAVADOC-GENERATED
man: $(MAN3_FILES)