diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 108 |
1 files changed, 24 insertions, 84 deletions
diff --git a/Makefile.in b/Makefile.in index d758b47860..648575e5fd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,6 +19,8 @@ # Toplevel makefile for building the Erlang system # +.NOTPARALLEL: + # ---------------------------------------------------------------------- # And you'd think that this would be obvious... :-) @@ -156,7 +158,9 @@ ERLANG_LIBDIR = $(DESTDIR)$(ERLANG_INST_LIBDIR) MAKE = @MAKE_PROG@ # This should be set to the target "arch-vendor-os" -export TARGET = @TARGET@ +TARGET := @TARGET@ +include $(ERL_TOP)/make/target.mk +export TARGET BOOTSTRAP_ONLY = @BOOTSTRAP_ONLY@ @@ -215,7 +219,6 @@ BOOTSTRAP_ROOT = $(ERL_TOP) # depending on which system is preferred.) LOCAL_PATH = $(ERL_TOP)/erts/bin/$(TARGET):$(ERL_TOP)/erts/bin ifeq ($(TARGET),win32) -WIN32_WRAPPER_PATH=$(ERL_TOP)/erts/etc/win32/cygwin_tools BOOT_PREFIX=$(WIN32_WRAPPER_PATH):$(BOOTSTRAP_ROOT)/bootstrap/bin: else BOOT_PREFIX=$(BOOTSTRAP_ROOT)/bootstrap/bin: @@ -309,13 +312,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 @@ -373,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} \ @@ -401,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) \ @@ -422,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) @@ -457,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} \ @@ -486,7 +462,8 @@ preloaded: $(MAKE) opt BUILD_ALL=true dep depend: - test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/emulator && ERL_TOP=$(ERL_TOP) $(MAKE) generate depend) + test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/emulator && ERL_TOP=$(ERL_TOP) $(MAKE) generate) + test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/emulator && ERL_TOP=$(ERL_TOP) $(MAKE) depend) test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/lib_src && ERL_TOP=$(ERL_TOP) $(MAKE) depend) # Creates "erl" and "erlc" in bootstrap/bin which uses the precompiled @@ -718,6 +695,18 @@ tertiary_bootstrap_copy: cp $$x $$TF; \ true; \ done +# copy wx_object to remove undef behaviour warnings + for x in lib/wx/ebin/wx_object.beam; do \ + BN=`basename $$x`; \ + TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/wx/ebin/$$BN; \ + test -f $$TF && \ + test '!' -z "`find $$x -newer $$TF -print`" && \ + cp $$x $$TF; \ + test '!' -f $$TF && \ + cp $$x $$TF; \ + true; \ + done + for x in lib/test_server/include/*.hrl; do \ BN=`basename $$x`; \ TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/test_server/include/$$BN; \ @@ -878,49 +867,10 @@ tests release_tests: $(TEST_DIRS) $(TEST_DIRS): if test -f $@/Makefile; then \ - (cd $@; $(MAKE) TESTROOT=$(TESTSUITE_ROOT) release_tests) || exit $$?; \ + (cd $@; $(MAKE) TESTROOT=$(TESTSUITE_ROOT) \ + PATH=$(ERL_TOP)/bin:$(BOOT_PREFIX)$${PATH} release_tests) || exit $$?; \ fi -# ---------------------------------------------------------------------- -# Obsolete type of bootstrap where all stages where built with installed sytem -# shuld no longer be used and is soon to be removed. -# Abbreviations: OC = Old Compiler, NC = New Compiler, -# OE = Old Emulator, NE = New Emulator - -old_com_bootstrap: old_bootstrap_nc_for_ne_all_stages old_bootstrap_ne old_bootstrap_scripts - -# -# Builds the New Compiler for the New Emulator (using existing erlc -# and possibly new compiler) then copy everything to the release area. -# Use to create the commerciall bootstrap version, which should be obsolete. -# -old_bootstrap_nc_for_ne_all_stages: - test -d $(TESTROOT) || mkdir -p $(TESTROOT) - cd lib && $(MAKE) BOOTSTRAP=1 TYPE=release release - cd lib && $(MAKE) SECONDARY_BOOTSTRAP=1 TYPE=release release - cd lib && $(MAKE) TERTIARY_BOOTSTRAP=1 TYPE=release release - - - -old_bootstrap_ne: - cd erts && $(MAKE) release - -old_bootstrap_scripts: - cd erts/start_scripts && $(MAKE) release - - -# This is one strange name for a target, this actually builds and strips only -# the primary bootstrap, a minimal set of beam files to be able to continue -# bootstrap builds. It's used by other makefiles, so I refrain from -# changing the name right now... -bootstrap_nc_for_ne_no_debug_sym: - test -d $(TESTROOT) || mkdir -p $(TESTROOT) - cd lib && $(MAKE) ERLC_FLAGS='-pa $(BOOTSTRAP_COMPILER)/ebin' \ - BOOTSTRAP_TOP=$(BOOTSTRAP_TOP) BOOTSTRAP=1 TYPE=release release - $(ERL_TOP)/erts/emulator/utils/beam_strip $(TESTROOT)/lib/*/ebin/*.beam - -# ---------------------------------------------------------------------- - # # Install # @@ -949,15 +899,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: @@ -1009,7 +950,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 |