diff options
| author | Kjell Winblad <[email protected]> | 2019-06-26 08:31:19 +0200 |
|---|---|---|
| committer | Kjell Winblad <[email protected]> | 2019-06-26 08:31:19 +0200 |
| commit | 14944c65bada76cf246f885f7a146c7fd54cb3df (patch) | |
| tree | da9368f155f49924d15db82506bfe0d9c8b26ffa /erts | |
| parent | c59148c2995d5ac63094ab2e39682f47671ee37e (diff) | |
| parent | 2f246b551cca5ca7ca9187282e42650976a65cbb (diff) | |
| download | otp-14944c65bada76cf246f885f7a146c7fd54cb3df.tar.gz otp-14944c65bada76cf246f885f7a146c7fd54cb3df.tar.bz2 otp-14944c65bada76cf246f885f7a146c7fd54cb3df.zip | |
Merge branch 'kjell/make_test/OTP-15812'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/Makefile | 2 | ||||
| -rw-r--r-- | erts/emulator/Makefile.in | 2 | ||||
| -rw-r--r-- | erts/epmd/Makefile | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/erts/Makefile b/erts/Makefile index e62c896170..12ac50f7d5 100644 --- a/erts/Makefile +++ b/erts/Makefile @@ -153,3 +153,5 @@ release_docs: .PHONY: xmllint xmllint: $(MAKE) -C doc/src $@ + +include $(ERL_TOP)/make/app_targets.mk diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index a9f3bb8e89..46df9b8bc3 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -1291,3 +1291,5 @@ ifndef VOID_EMULATOR endif endif endif + +include $(ERL_TOP)/make/app_targets.mk diff --git a/erts/epmd/Makefile b/erts/epmd/Makefile index d3308ddedc..e4b201bd88 100644 --- a/erts/epmd/Makefile +++ b/erts/epmd/Makefile @@ -31,3 +31,5 @@ SPECIAL_TARGETS = # Default Subdir Targets # ---------------------------------------------------- include $(ERL_TOP)/make/otp_subdir.mk + +include $(ERL_TOP)/make/app_targets.mk |