MT#56184 build: Fix parallel building

Fix instances of make rules not being parallel execution safe, where the
targets declare a list of dependencies which depend on the order they
have been declared to be executed serially, otherwise these can cause
race conditions.

Either move some of the dependencies down into their transitive
dependencies, or rearrange them to call $(MAKE) to force a serial
point. In other instances add missing dependencies to make sure the
objects to install have previously been built.

Change-Id: I21b499557ac5e9faa603841fa1882b58239ee650
mr11.4.1
Guillem Jover 3 years ago
parent 1cacd5c46e
commit f3a48f2a30

@ -34,7 +34,7 @@ modules:
done
.PHONY: install
install:
install: modules
@set -e; \
for r in $(subdirs) "" ; do \
if [ -n "$$r" ]; then \

@ -68,7 +68,7 @@ modules:
install: install-bin
.PHONY: install-bin
install-bin:
install-bin: modules
@set -e; \
for r in $(app_modules) "" ; do \
if [ -n "$$r" ]; then \

@ -50,7 +50,7 @@ modules:
install: install-bin
.PHONY: install-bin
install-bin:
install-bin: modules
@set -e; \
for r in $(dsm_modules) "" ; do \
if [ -n "$$r" ]; then \

@ -38,7 +38,7 @@ modules:
install: install-bin
.PHONY: install-bin
install-bin:
install-bin: modules
@set -e; \
for r in $(modules) "" ; do \
if [ -n "$$r" ]; then \

@ -38,7 +38,7 @@ modules:
install: install-bin
.PHONY: install-bin
install-bin:
install-bin: modules
@set -e; \
for r in $(modules) "" ; do \
if [ -n "$$r" ]; then \

@ -22,7 +22,7 @@ PYCHECKERDOCARGS = --classdoc --funcdoc
module_conf_files = $(notdir $(wildcard etc/*.conf))
.PHONY: all
all: clean compile
all: compile
.PHONY: clean
clean:
@ -30,7 +30,7 @@ clean:
rm -f ${TARBALL_PREFIX}*.tar.gz
.PHONY: compile
compile:
compile: clean
python${PYTHON_VERSION} $(PYSEMSPATH)/py_comp -q .
.PHONY: install

@ -40,7 +40,7 @@ modules:
install: install-bin install-cfg
.PHONY: install-bin
install-bin:
install-bin: modules
@set -e; \
for r in $(cc_modules) "" ; do \
if [ -n "$$r" ]; then \

@ -1,7 +1,7 @@
all: participant.py conftable.py callbox.py account.py
install:
install: all
cp *.py tablet/conf
%.py: %.ui

@ -115,10 +115,8 @@ $(NAME): sip_stack resample_lib core ../Makefile.defs
$(LD) -o $(NAME) $(OBJS) $(LDFLAGS) $(EXTRA_LDFLAGS)
install: all mk-install-dirs \
install-audio \
install-bin \
install-modules
install: mk-install-dirs
$(MAKE) install-audio install-bin install-modules
# note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
@ -135,10 +133,10 @@ install-cfg: $(DESTDIR)$(cfg_target) $(DESTDIR)$(app_cfg_target)
$(INSTALL_CFG) etc/app_mapping.conf.sample $(DESTDIR)$(app_cfg_target)app_mapping.conf
install-bin: $(DESTDIR)$(bin_prefix)/$(bin_dir)
install-bin: $(NAME) $(DESTDIR)$(bin_prefix)/$(bin_dir)
$(INSTALL_BIN) $(NAME) $(DESTDIR)$(bin_prefix)/$(bin_dir)
install-modules: $(PLUGIN_DIR) $(DESTDIR)$(modules_prefix)/$(modules_dir)
install-modules: modules $(PLUGIN_DIR) $(DESTDIR)$(modules_prefix)/$(modules_dir)
$(MAKE) -C $(PLUGIN_DIR) install
install-modules-cfg: $(PLUGIN_DIR)

@ -34,7 +34,7 @@ modules:
done
.PHONY: install
install:
install: modules
@set -e; \
for r in $(core_modules) "" ; do \
if [ -n "$$r" ]; then \

@ -5,11 +5,11 @@ include $(COREPATH)/../Makefile.defs
sems_tools = sems-logfile-callextract
install: $(sems_tools) install_tools
install: install_tools
make_tools: $(sems_tools)
install_tools: $(DESTDIR)$(bin_prefix)/$(bin_dir)
install_tools: make_tools $(DESTDIR)$(bin_prefix)/$(bin_dir)
@set -e; \
for r in $(sems_tools) ; do \
x=`echo $$r | sed s/sems-/$(APP_NAME)-/g` ; \

Loading…
Cancel
Save