diff options
author | Patrik Nyblom <[email protected]> | 2010-09-10 14:37:02 +0200 |
---|---|---|
committer | Patrik Nyblom <[email protected]> | 2010-09-10 14:37:02 +0200 |
commit | 6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02 (patch) | |
tree | 07492ef6b7f98ef05ecc47518038980173996480 /erts/test/Makefile | |
parent | bf276aef756681bd2ccb31aff54b646ff6a68d73 (diff) | |
parent | 19a3f0c5bab37ba261abbca6c0253c1e3cb4d3ac (diff) | |
download | otp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.tar.gz otp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.tar.bz2 otp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.zip |
Merge branch 'pan/added-autoimports/OTP-8763' into dev
* pan/added-autoimports/OTP-8763:
Remove warnings for clashes with new autoimported BIFs
Add testcase for autoimport and the erlang.xml doc consistency
Correct erlang.xml regarding autoimports
Add new autoimports for R14B
Diffstat (limited to 'erts/test/Makefile')
-rw-r--r-- | erts/test/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/erts/test/Makefile b/erts/test/Makefile index 796403e182..94458da019 100644 --- a/erts/test/Makefile +++ b/erts/test/Makefile @@ -28,6 +28,7 @@ EBIN = . # ---------------------------------------------------- MODULES= \ + autoimport_SUITE \ erlc_SUITE \ install_SUITE \ nt_SUITE \ @@ -38,12 +39,14 @@ MODULES= \ erlexec_SUITE \ z_SUITE +ERL_XML = $(ERL_TOP)/erts/doc/src/erlang.xml +ERL_XML_TARGET = autoimport_SUITE_data/erlang.xml ERL_FILES= $(MODULES:%=%.erl) TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) -EXTRA_FILES = install_SUITE_data/install_bin +EXTRA_FILES = install_SUITE_data/install_bin $(ERL_XML_TARGET) # ---------------------------------------------------- # Release directory specification @@ -65,6 +68,10 @@ install_SUITE_data/install_bin: ../../make/install_bin rm -f $@ cp -p $< $@ +$(ERL_XML_TARGET): $(ERL_XML) + rm -f $@ + cp -p $< $@ + clean: rm -f $(TARGET_FILES) $(EXTRA_FILES) rm -f core *~ |