aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-02-11 14:17:20 +0100
committerHenrik Nord <[email protected]>2014-02-11 14:17:33 +0100
commit264c63ecc5d6409e0498994b58eab84debbca00d (patch)
treeddb4381acacb2c36e641f80acd26fbf8cef60077
parent7b0af710d493909799de6e6123f81b5e7b8d2ef2 (diff)
parenta8974c567064fb4e39908fe9d60503d8de5f8bea (diff)
downloadotp-264c63ecc5d6409e0498994b58eab84debbca00d.tar.gz
otp-264c63ecc5d6409e0498994b58eab84debbca00d.tar.bz2
otp-264c63ecc5d6409e0498994b58eab84debbca00d.zip
Merge branch 'larsr/distclean'
* larsr/distclean: make clean should not remove SKIP files OTP-11683
-rw-r--r--Makefile.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index d1fd64632c..d3d81c8817 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -992,10 +992,13 @@ $(IBIN_DIR):
clean: check_recreate_primary_bootstrap
rm -f *~ *.bak config.log config.status prebuilt.files ibin/*
- find . -type f -name SKIP -print | xargs $(RM)
cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
cd lib && ERL_TOP=$(ERL_TOP) $(MAKE) clean BUILD_ALL=true
+distclean: clean
+ find . -type f -name SKIP -print | xargs $(RM)
+ find . -type f -name SKIP-APPLICATIONS -print | xargs $(RM)
+
#
# Just wipe out emulator, not libraries
#