dialyzer: Remove special-case build in the top Makefile

There used to be a requirement that Dialyzer was build at the
very end.  Since this requirement has been dropped, remove the
special-case build targets for Dialyzer in the top-level
Makefile.

2 files changed, 7 insertions, 42 deletions

diff --git a/Makefile.in b/Makefile.in
index 96a9c407b4..b0a00d098a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -311,13 +311,13 @@ ifeq ($(BOOTSTRAP_ONLY),yes)
 all: bootstrap
 else
 # The normal case; not cross compiling, and not bootstrap only build.
-all: bootstrap libs local_setup dialyzer
+all: bootstrap libs local_setup
 endif
 
 else
 # Cross compiling
 
-all: cross_check_erl depend emulator libs start_scripts dialyzer
+all: cross_check_erl depend emulator libs start_scripts
 
 endif
 
@@ -376,17 +376,6 @@ else
 	cd $(ERL_TOP)/lib && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(INST_PATH_PREFIX)$${PATH} \
 	    $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) release
-ifneq ($(findstring vxworks,$(TARGET)),vxworks)
-	@if test -f lib/dialyzer/SKIP ; then			\
-		echo "=== Skipping dialyzer, reason:" ;		\
-		cat lib/dialyzer/SKIP ;				\
-		echo "===" ;					\
-	else							\
-		cd $(ERL_TOP)/lib/dialyzer &&			\
-		  ERL_TOP=$(ERL_TOP) PATH=$(INST_PATH_PREFIX)$${PATH} \
-		    $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) release ; \
-	fi
-endif
 endif
 	cd $(ERL_TOP)/erts && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(INST_PATH_PREFIX)$${PATH} \
@@ -404,9 +393,6 @@ else
 	cd $(ERL_TOP)/lib && \
 	  PATH=$(ERL_TOP)/bin:$${PATH} ERL_TOP=$(ERL_TOP) \
 	  $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) $@
-	cd $(ERL_TOP)/lib/dialyzer && \
-	  PATH=$(ERL_TOP)/bin:$${PATH} ERL_TOP=$(ERL_TOP) \
-	  $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) $@
 endif
 	cd $(ERL_TOP)/erts && \
 	  PATH=$(ERL_TOP)/bin:$${PATH} ERL_TOP=$(ERL_TOP) \
@@ -425,7 +411,7 @@ BOOT_BINDIR=$(BOOTSTRAP_ROOT)/bootstrap/erts/bin
 BEAM_EVM=$(ERL_TOP)/bin/$(TARGET)/beam_evm
 BOOTSTRAP_COMPILER  =  $(BOOTSTRAP_TOP)/primary_compiler
 
-.PHONY: emulator libs kernel stdlib compiler hipe dialyzer typer syntax_tools preloaded
+.PHONY: emulator libs kernel stdlib compiler hipe typer syntax_tools preloaded
 
 emulator:
 	cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) NO_START_SCRIPTS=true $(TYPE) FLAVOR=$(FLAVOR)
@@ -460,19 +446,6 @@ hipe:
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)$${PATH} \
 		$(MAKE) opt BUILD_ALL=true
 
-dialyzer:
-ifneq ($(OTP_SMALL_BUILD),true)
-	@if test -f lib/dialyzer/SKIP ; then			\
-		echo "=== Skipping dialyzer, reason:" ;		\
-		cat lib/dialyzer/SKIP ;				\
-		echo "===" ;					\
-	else							\
-		cd lib/dialyzer &&				\
-		ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)$${PATH}  \
-			$(MAKE) opt BUILD_ALL=true ;		\
-	fi
-endif
-
 typer:
 	cd lib/typer && \
 	ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)$${PATH} \
@@ -908,15 +881,6 @@ else
 	cd lib && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(INST_PATH_PREFIX)$${PATH} \
 	  $(MAKE) TESTROOT=$(ERLANG_LIBDIR) BUILD_ALL=true release
-	@if test -f lib/dialyzer/SKIP ; then			\
-		echo "=== Skipping dialyzer, reason:" ;		\
-		cat lib/dialyzer/SKIP ;				\
-		echo "===" ;					\
-	else							\
-		cd lib/dialyzer && 				\
-	  	ERL_TOP=$(ERL_TOP) PATH=$(INST_PATH_PREFIX)$${PATH} \
-		$(MAKE) TESTROOT=$(ERLANG_LIBDIR) BUILD_ALL=true release ; \
-	fi
 endif
 
 install.Install:
@@ -968,7 +932,6 @@ clean: check_recreate_primary_bootstrap
 	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
-	cd lib/dialyzer && ERL_TOP=$(ERL_TOP) $(MAKE) clean
 
 #
 # Just wipe out emulator, not libraries
diff --git a/lib/Makefile b/lib/Makefile
index e3da390dd4..c443425f8b 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -48,7 +48,8 @@ else
           diameter \
           cosTransactions cosEvent cosTime cosNotification cosProperty \
           cosFileTransfer cosEventDomain et megaco webtool \
-	  xmerl edoc eunit ssh inviso typer docbuilder erl_docgen common_test percept
+	  xmerl edoc eunit ssh inviso typer docbuilder erl_docgen \
+	  common_test percept dialyzer
 # dialyzer
         OTHER_SUB_DIRECTORIES += hipe
       else # BUILD_ALL on unix
@@ -59,7 +60,8 @@ else
           diameter \
           cosTransactions cosEvent cosTime cosNotification \
           cosProperty cosFileTransfer cosEventDomain et megaco webtool \
-	  xmerl edoc eunit ssh inviso typer docbuilder erl_docgen common_test percept
+	  xmerl edoc eunit ssh inviso typer docbuilder erl_docgen \
+	  common_test percept dialyzer
 # dialyzer
         OTHER_SUB_DIRECTORIES += hipe $(TSP_APP)
       endif