diff options
| author | Erlang/OTP <[email protected]> | 2010-01-19 06:51:22 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-01-19 06:51:22 +0000 |
| commit | 141b8f28bc2180c0fb17479562cc59dce51218d4 (patch) | |
| tree | 6a04847cd5e8ee69d722b35420571552a554a9a3 /Makefile.in | |
| parent | d30f9a6d39b6b993aeae04797fa9b29e2729fbf4 (diff) | |
| parent | f22949680eb728659476b268f487d2a50019357b (diff) | |
| download | otp-141b8f28bc2180c0fb17479562cc59dce51218d4.tar.gz otp-141b8f28bc2180c0fb17479562cc59dce51218d4.tar.bz2 otp-141b8f28bc2180c0fb17479562cc59dce51218d4.zip | |
Merge branch 'fh/common_test-includes' into ccase/r13b04_dev
* fh/common_test-includes:
make it possible to include ct.hrl using include_lib
Include test_servers's include files in the bootstrap
OTP-8379 It is now possible to include the ct.hrl using the -include_lib
directive. (Thanks to Fred Hebert.)
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 107bf80bb5..7596a82720 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,19 +1,19 @@ # # %CopyrightBegin% -# -# Copyright Ericsson AB 1998-2009. All Rights Reserved. -# +# +# Copyright Ericsson AB 1998-2010. All Rights Reserved. +# # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in # compliance with the License. You should have received a copy of the # Erlang Public License along with this software. If not, it can be # retrieved online at http://www.erlang.org/. -# +# # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See # the License for the specific language governing rights and limitations # under the License. -# +# # %CopyrightEnd% # Toplevel makefile for building the Erlang system @@ -441,6 +441,8 @@ fourth_bootstrap_copy: if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/wx ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/wx ; fi if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/ebin ; fi if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/include ; fi + if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server ; fi + if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server/include ; fi for x in lib/ic/ebin/*.beam; do \ BN=`basename $$x`; \ TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/ic/ebin/$$BN; \ @@ -506,6 +508,16 @@ fourth_bootstrap_copy: cp $$x $$TF; \ true; \ done + for x in lib/test_server/include/*.hrl; do \ + BN=`basename $$x`; \ + TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/test_server/include/$$BN; \ + test -f $$TF && \ + test '!' -z "`find $$x -newer $$TF -print`" && \ + cp $$x $$TF; \ + test '!' -f $$TF && \ + cp $$x $$TF; \ + true; \ + done # cp lib/syntax_tools/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools/ebin |