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/public_key | |
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/public_key')
-rw-r--r-- | lib/public_key/asn1/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile index 6b2a2bc3d9..c4f8d65aa7 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -79,7 +79,7 @@ clean: docs: -%.erl: %.set.asn +%.erl %.hrl: %.set.asn erlc $(ASN_FLAGS) $< $(HRL_FILES): $(ASN_HRLS) |