summaryrefslogtreecommitdiff
path: root/erts/lib_src
diff options
context:
space:
mode:
authorRaimo Niskanen <raimo@erlang.org>2012-01-11 10:15:59 +0100
committerRaimo Niskanen <raimo@erlang.org>2012-01-13 14:37:05 +0100
commite601d283b9edafc6ded6589947f1f2de9ede0248 (patch)
treeb60b0b0afbb9539596c450aa984d14db97b1959d /erts/lib_src
parent5bdfce65ad97251e25b09d94231f5a7386a3c4e3 (diff)
downloaderlang-e601d283b9edafc6ded6589947f1f2de9ede0248.tar.gz
erts,tools: Fix parallel make for erts/lib_src
Use a make timestamp file to condense dependencies to some part(s) of erts/lib_src build results.
Diffstat (limited to 'erts/lib_src')
-rw-r--r--erts/lib_src/Makefile.in24
1 files changed, 14 insertions, 10 deletions
diff --git a/erts/lib_src/Makefile.in b/erts/lib_src/Makefile.in
index 54ee7410fd..e427ecf312 100644
--- a/erts/lib_src/Makefile.in
+++ b/erts/lib_src/Makefile.in
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 2004-2011. All Rights Reserved.
+# Copyright Ericsson AB 2004-2012. All Rights Reserved.
#
# The contents of this file are subject to the Erlang Public License,
# Version 1.1, (the "License"); you may not use this file except in
@@ -318,10 +318,14 @@ ETHREAD_LIB=
endif
+_create_dirs := $(shell mkdir -p $(CREATE_DIRS))
#
# Everything to build
#
-all: $(CREATE_DIRS) $(ETHREAD_LIB) $(ERTS_LIBS) $(ERTS_INTERNAL_LIBS)
+.PHONY: all
+all: $(OBJ_DIR)/MADE
+
+$(OBJ_DIR)/MADE: $(ETHREAD_LIB) $(ERTS_LIBS) $(ERTS_INTERNAL_LIBS)
ifeq ($(OMIT_OMIT_FP),yes)
@echo '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *'
@echo '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *'
@@ -331,6 +335,8 @@ ifeq ($(OMIT_OMIT_FP),yes)
@echo '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *'
@echo '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *'
endif
+ echo $? > $(OBJ_DIR)/MADE
+
#
# The libs ...
#
@@ -428,13 +434,6 @@ $(MTd_OBJ_DIR)/%.o: $(ETHR_THR_LIB_BASE_DIR)/%.c
$(CC) $(THR_DEFS) $(CFLAGS) -MTd $(INCLUDES) -c $< -o $@
#
-# Create directories
-#
-
-$(CREATE_DIRS):
- $(MKDIR) -p $@
-
-#
# Install
#
@@ -471,6 +470,7 @@ INTERNAL_RELEASE_LIBS= \
$(ETHREAD_LIB) \
$(ERTS_INTERNAL_LIBS)
+.PHONY: release_spec
release_spec: all
ifneq ($(strip $(RELEASE_INCLUDES)),)
$(INSTALL_DIR) $(RELSYSDIR)/include
@@ -500,19 +500,22 @@ ifneq ($(strip $(INTERNAL_RELEASE_LIBS)),)
$(INSTALL_DATA) $(INTERNAL_RELEASE_LIBS) $(RELSYSDIR)/lib/internal
endif
+.PHONY: docs
docs:
+.PHONY: release_docs_spec
release_docs_spec:
-
#
# Cleanup
#
+.PHONY: clean
clean:
$(RM) -rf ../lib/internal/$(TARGET)/*
$(RM) -rf ../lib/$(TARGET)/*
$(RM) -rf obj/$(TARGET)/*
$(RM) -f $(TARGET)/depend.mk
+ $(RM) -f $(OBJ_DIR)/erts_lib
#
# Make dependencies
@@ -556,6 +559,7 @@ SED_MTd_DEPEND=sed '$(SED_PREFIX)$(SED_REPL_MTd_O);$(SED_REPL_TT_DIR);$(SED_REPL
DEPEND_MK=$(TARGET)/depend.mk
+.PHONY: depend
depend:
@echo "Generating dependency file $(DEPEND_MK)..."
@echo "# Generated dependency rules" > $(DEPEND_MK);