aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/inets_app/Makefile
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2016-05-03 10:10:55 +0200
committerErlang/OTP <[email protected]>2016-05-03 10:10:55 +0200
commit72f65b32bd479b4ebcba09d422ef3716f8cf9ff9 (patch)
treed74928717e34e76480ab9e85e7f8bccd8c206953 /lib/inets/src/inets_app/Makefile
parent49d86a43c207f4825f7242f34a7cc8d3584993a7 (diff)
parent4def16a1b087d082360b7cd5d0efe83ee38f0517 (diff)
downloadotp-72f65b32bd479b4ebcba09d422ef3716f8cf9ff9.tar.gz
otp-72f65b32bd479b4ebcba09d422ef3716f8cf9ff9.tar.bz2
otp-72f65b32bd479b4ebcba09d422ef3716f8cf9ff9.zip
Merge branch 'ingela/inets/deprecated-inets_regexp/OTP-13533' into maint-18
* ingela/inets/deprecated-inets_regexp/OTP-13533: inets: Prepare for release inets: Put back inets_regexp module in OTP 18
Diffstat (limited to 'lib/inets/src/inets_app/Makefile')
-rw-r--r--lib/inets/src/inets_app/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
index 0a4b625b6a..7f51676dc5 100644
--- a/lib/inets/src/inets_app/Makefile
+++ b/lib/inets/src/inets_app/Makefile
@@ -49,7 +49,8 @@ MODULES = \
inets_sup \
inets_trace \
inets_lib \
- inets_time_compat
+ inets_time_compat \
+ inets_regexp
INTERNAL_HRL_FILES = inets_internal.hrl
EXTERNAL_HRL_FILES = ../../include/httpd.hrl \