diff options
| author | Björn Gustavsson <[email protected]> | 2011-08-08 13:26:45 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-08-08 13:26:45 +0200 |
| commit | d95f24d2d3921461fc1c57f15fbaee7a4f149df4 (patch) | |
| tree | 93e8654badbe1812bd489b56f3ad184586045dc8 /lib/jinterface/java_src/com | |
| parent | 302b2a1bf0194ca81c7731699b75e4800f718955 (diff) | |
| parent | 542edfc2e267ba50cc948bb525d945244cf931f9 (diff) | |
| download | otp-d95f24d2d3921461fc1c57f15fbaee7a4f149df4.tar.gz otp-d95f24d2d3921461fc1c57f15fbaee7a4f149df4.tar.bz2 otp-d95f24d2d3921461fc1c57f15fbaee7a4f149df4.zip | |
Merge branch 'bjorn/parallel-make/OTP-9451' into major
* bjorn/parallel-make/OTP-9451: (28 commits)
erl_interface: Support parallel make
dialyzer: Remove special-case build in the top Makefile
pcre: Rename Makefile.in to pcre.mk and include it
cos*/src/Makefile: Support parallel make
ic: Support parallel make
orber: Support parallel make
.gitignore: Ignore IDL-GENERATED
public_key: Support parallel make
ssh: Support parallel make
os_mon: Support parallel make
diameter: Support parallel make
snmp: Support parallel make
megaco: Support parallel make
megaco/src/flex/Makefile.in: Support parallel make
*/c_src/Makefile*: Support parallel make
eunit: Support parallel make
gs: Support parallel make
common_test Makefile: Support parallel make
erts/emulator/Makefile.in: Support parallel make
erts: Fix dependency generation
...
Diffstat (limited to 'lib/jinterface/java_src/com')
| -rw-r--r-- | lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile (renamed from lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp) | 2 | ||||
| -rw-r--r-- | lib/jinterface/java_src/com/ericsson/otp/erlang/ignore_config_record.inf | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile index d0ff9cda34..e772a2b0a5 100644 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile @@ -96,7 +96,7 @@ docs: # include $(ERL_TOP)/make/otp_release_targets.mk release release_docs release_tests release_html: - $(MAKE) -f Makefile.otp $(MFLAGS) RELEASE_PATH=$(RELEASE_PATH) $(TARGET_MAKEFILE) $@_spec + $(MAKE) $(MFLAGS) RELEASE_PATH=$(RELEASE_PATH) $(TARGET_MAKEFILE) $@_spec release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/java_src/com/ericsson/otp/erlang diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/ignore_config_record.inf b/lib/jinterface/java_src/com/ericsson/otp/erlang/ignore_config_record.inf deleted file mode 100644 index 0a5053eba3..0000000000 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/ignore_config_record.inf +++ /dev/null @@ -1 +0,0 @@ -This file makes clearmake use the -T switch for this subdirectory |