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/ssh/src/Makefile | |
| 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/ssh/src/Makefile')
| -rw-r--r-- | lib/ssh/src/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile index 42880fa80b..e7cf2c6723 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -127,13 +127,10 @@ $(APP_TARGET): $(APP_SRC) ../vsn.mk $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk sed -e 's;%VSN%;$(VSN);' $< > $@ -%.hrl: %.asn1 - erlc $(ASN_FLAGS) $< +%.erl %.hrl: %.asn1 + $(ERLC) $(ASN_FLAGS) $< -DSS.hrl DSS.erl: DSS.asn1 -PKCS-1.hrl PKCS-1.erl: PKCS-1.asn1 - -$(EBIN)/ssh_file.$(EMULATOR): $(ASN_HRLS) +$(EBIN)/ssh_file.$(EMULATOR) $(EBIN)/ssh_rsa.$(EMULATOR): $(ASN_HRLS) docs: |