diff options
| author | Björn Gustavsson <[email protected]> | 2015-05-25 11:35:41 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-05-25 11:35:41 +0200 |
| commit | c12d2dc802df9510ae32ac37ccefeb162767774c (patch) | |
| tree | ee319edd72827c0fd7b0d8c32df59169d314bfad /lib/syntax_tools/test/Makefile | |
| parent | ca868041729863845f71b6abadc079c414c18168 (diff) | |
| parent | 279fe010040ad1e09f67a509596cf4227afe658d (diff) | |
| download | otp-c12d2dc802df9510ae32ac37ccefeb162767774c.tar.gz otp-c12d2dc802df9510ae32ac37ccefeb162767774c.tar.bz2 otp-c12d2dc802df9510ae32ac37ccefeb162767774c.zip | |
Merge branch 'richcarl/syntax_tools/add-merl'
* richcarl/syntax_tools/add-merl:
Make merl compatible with OTP 18.0
Add tests for merl in syntax_tools
Include Merl in Syntax Tools
Diffstat (limited to 'lib/syntax_tools/test/Makefile')
| -rw-r--r-- | lib/syntax_tools/test/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/syntax_tools/test/Makefile b/lib/syntax_tools/test/Makefile index f67e3f8984..569c044b1a 100644 --- a/lib/syntax_tools/test/Makefile +++ b/lib/syntax_tools/test/Makefile @@ -6,7 +6,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk # ---------------------------------------------------- MODULES= \ - syntax_tools_SUITE + syntax_tools_SUITE \ + merl_SUITE ERL_FILES= $(MODULES:%=%.erl) |