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/orber | |
| 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/orber')
| -rw-r--r-- | lib/orber/COSS/CosNaming/Makefile | 2 | ||||
| -rw-r--r-- | lib/orber/examples/Stack/Makefile | 2 | ||||
| -rw-r--r-- | lib/orber/src/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile index 28b4d9cacc..d4b2079036 100644 --- a/lib/orber/COSS/CosNaming/Makefile +++ b/lib/orber/COSS/CosNaming/Makefile @@ -113,7 +113,7 @@ debug: @${MAKE} TYPE=debug clean: - rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) + rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) IDL-GENERATED rm -f errs core *~ $(APP_TARGET): $(APP_SRC) diff --git a/lib/orber/examples/Stack/Makefile b/lib/orber/examples/Stack/Makefile index ccb65038a3..215e57fcbe 100644 --- a/lib/orber/examples/Stack/Makefile +++ b/lib/orber/examples/Stack/Makefile @@ -96,7 +96,7 @@ ERL_COMPILE_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: diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile index ed62c94b98..e812e22b46 100644 --- a/lib/orber/src/Makefile +++ b/lib/orber/src/Makefile @@ -212,7 +212,7 @@ debug: opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) clean: - rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) + rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED rm -f errs core *~ $(APP_TARGET): $(APP_SRC) ../vsn.mk |