diff options
| author | Erlang/OTP <[email protected]> | 2010-01-22 07:09:30 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-01-22 08:17:13 +0100 |
| commit | c7187afaf4d672e0320a73708fe44d5ac5520b52 (patch) | |
| tree | b1d97c44e6efab4cb5f6dbac4768dee8b012d87d /erts/epmd | |
| parent | 246811f7d8fc9d8cadb4f746f719d1a65ee738fc (diff) | |
| parent | 862e0ebe4fbc08ade2ebaf08b8ad218ac705d8b6 (diff) | |
| download | otp-c7187afaf4d672e0320a73708fe44d5ac5520b52.tar.gz otp-c7187afaf4d672e0320a73708fe44d5ac5520b52.tar.bz2 otp-c7187afaf4d672e0320a73708fe44d5ac5520b52.zip | |
Merge branch 'bg/avoid-etop-in-include' into ccase/r13b04_dev
* bg/avoid-etop-in-include:
epmd tests: fix build of test suites on Windows
system test: fix build of test suites on Windows
Diffstat (limited to 'erts/epmd')
| -rw-r--r-- | erts/epmd/test/Makefile | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/erts/epmd/test/Makefile b/erts/epmd/test/Makefile index c1d62f0f93..13dad09ae3 100644 --- a/erts/epmd/test/Makefile +++ b/erts/epmd/test/Makefile @@ -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% # include $(ERL_TOP)/make/target.mk @@ -34,6 +34,8 @@ ERL_FILES= $(MODULES:%=%.erl) TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) +EMAKEFILE=Emakefile + # ---------------------------------------------------- # Release directory specification # ---------------------------------------------------- @@ -43,15 +45,17 @@ RELEPMDDIR = $(RELEASE_PATH)/epmd_test # FLAGS # ---------------------------------------------------- -ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include \ - -I$(ERL_TOP)/lib/kernel/src/ \ - $(EPMD_FLAGS) +ERL_COMPILE_FLAGS += $(EPMD_FLAGS) # ---------------------------------------------------- # Targets # ---------------------------------------------------- -tests debug opt: $(TARGET_FILES) +tests debug opt: $(EMAKEFILE) + +$(EMAKEFILE): Makefile $(ERL_FILES) + $(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) \ + -o$(EBIN) $(MODULES) > $(EMAKEFILE) clean: rm -f $(TARGET_FILES) @@ -69,7 +73,7 @@ release_spec: release_tests_spec: opt $(INSTALL_DIR) $(RELEPMDDIR) $(INSTALL_DATA) epmd.spec epmd.spec.vxworks $(ERL_FILES) \ - $(TARGET_FILES) $(RELEPMDDIR) + $(EMAKEFILE) $(RELEPMDDIR) chmod -f -R u+w $(RELEPMDDIR) release_docs_spec: |