diff options
| author | Björn Gustavsson <[email protected]> | 2011-10-20 10:48:59 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-10-20 10:48:59 +0200 |
| commit | 907772538853d2f89d60702eb140e164a72503ad (patch) | |
| tree | afa1cc7d03a19451ab129b45db6af444503d51d4 /lib/ic | |
| parent | 19a71e26888ab11dac720cc91e0e255e06812edf (diff) | |
| parent | 1c52cfa3b8cbc6e8650444ff10bab827965aa4ec (diff) | |
| download | otp-907772538853d2f89d60702eb140e164a72503ad.tar.gz otp-907772538853d2f89d60702eb140e164a72503ad.tar.bz2 otp-907772538853d2f89d60702eb140e164a72503ad.zip | |
Merge branch 'bjorn/parallel-make/OTP-9451'
* bjorn/parallel-make/OTP-9451:
corba applications: Fix broken 'make clean'
ic documentation: Support parallel make
Revert "ic documentation: Support parallel make"
Diffstat (limited to 'lib/ic')
| -rw-r--r-- | lib/ic/doc/src/Makefile | 8 | ||||
| -rw-r--r-- | lib/ic/examples/pre_post_condition/Makefile | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/ic/doc/src/Makefile b/lib/ic/doc/src/Makefile index acb6848fee..f255183e1f 100644 --- a/lib/ic/doc/src/Makefile +++ b/lib/ic/doc/src/Makefile @@ -206,8 +206,6 @@ JAVADOCFLAGS = \ # ---------------------------------------------------- # Targets # ---------------------------------------------------- -_create_dirs := $(shell mkdir -p $(JAVA_OUT_DIR)) - $(HTMLDIR)/%.gif: %.gif $(INSTALL_DATA) $< $@ @@ -255,11 +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 -$(JAVADOC_GENERATED_FILES): +$(JAVADOC_GENERATED_FILES): JAVADOC-GENERATED + +JAVADOC-GENERATED: $(JAVA_SOURCE_FILES:%=$(JAVA_SOURCE_DIR)/%) @(cd ../../java_src; $(JAVADOC) $(JAVADOCFLAGS) com.ericsson.otp.ic) + >JAVADOC-GENERATED man: $(MAN3_FILES) diff --git a/lib/ic/examples/pre_post_condition/Makefile b/lib/ic/examples/pre_post_condition/Makefile index 85cbbdb9ff..d57133c964 100644 --- a/lib/ic/examples/pre_post_condition/Makefile +++ b/lib/ic/examples/pre_post_condition/Makefile @@ -100,7 +100,7 @@ YRL_FLAGS = debug opt: $(TARGET_FILES) clean: - rm -f $(TARGET_FILES) $(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES) $(CLASS_FILES) + rm -f $(TARGET_FILES) $(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES) $(CLASS_FILES) IDL-GENERATED rm -f errs core *~ docs: |