diff options
| author | Lukas Larsson <[email protected]> | 2019-02-01 08:50:53 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-02-01 08:50:53 +0100 |
| commit | 148b91d7b91069f7f8b8ebcd688cef79c0030e71 (patch) | |
| tree | 9f3667926ce5406f8414a13cd89461167547310e /lib/erl_interface/src | |
| parent | 14fe4c3ccf93c023f851512e573e2bac7d00b232 (diff) | |
| parent | 930156b3c8bb411f256d606834083da10b313b28 (diff) | |
| download | otp-148b91d7b91069f7f8b8ebcd688cef79c0030e71.tar.gz otp-148b91d7b91069f7f8b8ebcd688cef79c0030e71.tar.bz2 otp-148b91d7b91069f7f8b8ebcd688cef79c0030e71.zip | |
Merge branch 'lukas/OTP-21.3-cleanup' into maint
* lukas/OTP-21.3-cleanup:
erl_interface: Fix bsd makefile problem
erts: Remove dead ERTS_MAGIC_REF_BIF_TIMERS code
Diffstat (limited to 'lib/erl_interface/src')
| -rw-r--r-- | lib/erl_interface/src/Makefile.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in index 614e7325a9..24ead76afb 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in @@ -31,12 +31,11 @@ .PHONY : debug opt release clean distclean depend -TARGET = @TARGET@ - # ---------------------------------------------------- # Application version and release dir specification # ---------------------------------------------------- include ../vsn.mk +include $(ERL_TOP)/make/target.mk include $(TARGET)/eidefs.mk include $(ERL_TOP)/make/output.mk |