diff options
author | Siri Hansen <[email protected]> | 2012-03-23 11:48:52 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2012-03-23 11:48:52 +0100 |
commit | b13b88779b3fbc0ef8bb91a17a5d064cd778e0fa (patch) | |
tree | 0f4bce1eb128326affdaacaeb0b2de2ac19860f8 /lib/reltool/test/reltool_server_SUITE_data/Makefile.src | |
parent | fd89175a2b17e92a0b90cb28e5af2375d3aa4535 (diff) | |
parent | 38f068341ebf04e5d6bf5eff7fb01e44bce228b6 (diff) | |
download | otp-b13b88779b3fbc0ef8bb91a17a5d064cd778e0fa.tar.gz otp-b13b88779b3fbc0ef8bb91a17a5d064cd778e0fa.tar.bz2 otp-b13b88779b3fbc0ef8bb91a17a5d064cd778e0fa.zip |
Merge branch 'siri/reltool/app-level-lib-dir/OTP-9977' into maint
* siri/reltool/app-level-lib-dir/OTP-9977:
[reltool] Allow lib_dir on app level to use relative path
[reltool] Add configuration parameter lib_dir on application level
Diffstat (limited to 'lib/reltool/test/reltool_server_SUITE_data/Makefile.src')
-rw-r--r-- | lib/reltool/test/reltool_server_SUITE_data/Makefile.src | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/reltool/test/reltool_server_SUITE_data/Makefile.src b/lib/reltool/test/reltool_server_SUITE_data/Makefile.src index 8ab077d64b..21410ceaa9 100644 --- a/lib/reltool/test/reltool_server_SUITE_data/Makefile.src +++ b/lib/reltool/test/reltool_server_SUITE_data/Makefile.src @@ -17,8 +17,12 @@ DEPENDENCIES= \ ESCRIPT= \ escript/someapp-1.0/ebin/mymod.@EMULATOR@ +SEL_VSN= \ + use_selected_vsn/b-1.0/ebin/b.@EMULATOR@ \ + use_selected_vsn/b-3.0/ebin/b.@EMULATOR@ \ + use_selected_vsn/lib2/b-2.0/ebin/b.@EMULATOR@ -all: $(OTP9229) $(DEPENDENCIES) $(ESCRIPT) +all: $(OTP9229) $(DEPENDENCIES) $(ESCRIPT) $(SEL_VSN) otp_9229/x-1.0/ebin/x.@EMULATOR@: otp_9229/x-1.0/src/x.erl erlc $(EFLAGS) -ootp_9229/x-1.0/ebin otp_9229/x-1.0/src/x.erl @@ -44,3 +48,10 @@ dependencies/z-1.0/ebin/z1.@EMULATOR@: dependencies/z-1.0/src/z1.erl escript/someapp-1.0/ebin/mymod.@EMULATOR@: escript/someapp-1.0/src/mymod.erl erlc $(EFLAGS) -oescript/someapp-1.0/ebin escript/someapp-1.0/src/mymod.erl + +use_selected_vsn/b-1.0/ebin/b.@EMULATOR@: use_selected_vsn/b-1.0/src/b.erl + erlc $(EFLAGS) -ouse_selected_vsn/b-1.0/ebin use_selected_vsn/b-1.0/src/b.erl +use_selected_vsn/b-3.0/ebin/b.@EMULATOR@: use_selected_vsn/b-3.0/src/b.erl + erlc $(EFLAGS) -ouse_selected_vsn/b-3.0/ebin use_selected_vsn/b-3.0/src/b.erl +use_selected_vsn/lib2/b-2.0/ebin/b.@EMULATOR@: use_selected_vsn/lib2/b-2.0/src/b.erl + erlc $(EFLAGS) -ouse_selected_vsn/lib2/b-2.0/ebin use_selected_vsn/lib2/b-2.0/src/b.erl |