зеркало из https://github.com/mozilla/gecko-dev.git
Bug 314958 - Separate out the tier_% target so I can built export_tier_% and libs_tier_% separately, with fixed makefile dependencies, r=cls
This commit is contained in:
Родитель
050c73fdff
Коммит
3c931eff75
66
Makefile.in
66
Makefile.in
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
include $(topsrcdir)/build/unix/modules.mk
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifeq (,$(filter-out all,$(BUILD_MODULES))$(MOZ_XSLT_STANDALONE))
|
||||
#
|
||||
# And now for something completely different...
|
||||
|
@ -494,42 +496,48 @@ ifdef MOZ_LDAP_XPCOM
|
|||
endif
|
||||
|
||||
# Map mozilla targets to standard automake target
|
||||
ifdef MOZ_ENABLE_LIBXUL
|
||||
tier_50: $(addsuffix /Makefile, $(filter-out $(STATIC_MAKEFILES), $($@_dirs)))
|
||||
@echo "tier_50: $(tier_50_dirs)"
|
||||
|
||||
export_tier_%:
|
||||
@echo "$@"
|
||||
@$(MAKE) $(addsuffix /Makefile,$(filter-out $(STATIC_MAKEFILES),$(tier_$*_dirs)))
|
||||
@$(EXIT_ON_ERROR) \
|
||||
for d in $(tier_50_dirs); do \
|
||||
$(UPDATE_TITLE) \
|
||||
if test ! -f $$d/Makefile; then \
|
||||
$(PERL) $(AUTOCONF_TOOLS)/make-makefile -t $(topsrcdir) -d $(DEPTH) $(CYGWIN_TOPSRCDIR) $$d/Makefile; \
|
||||
fi; \
|
||||
$(MAKE) -C $$d export; \
|
||||
done ; \
|
||||
for d in $(tier_50_dirs); do \
|
||||
$(UPDATE_TITLE) \
|
||||
$(MAKE) -C $$d libs; \
|
||||
for d in $(tier_$*_dirs); do \
|
||||
$(UPDATE_TITLE) \
|
||||
$(MAKE) -C $$d export; \
|
||||
done
|
||||
@echo "Building tools from tier 2/9/50"
|
||||
|
||||
libs_tier_%:
|
||||
@echo "$@"
|
||||
@$(MAKE) $(addsuffix /Makefile,$(filter-out $(STATIC_MAKEFILES),$(tier_$*_dirs)))
|
||||
@$(EXIT_ON_ERROR) \
|
||||
for d in $(tier_2_dirs) $(tier_9_dirs) $(tier_50_dirs); do \
|
||||
$(UPDATE_TITLE) \
|
||||
$(MAKE) -C $$d tools; \
|
||||
done;
|
||||
for d in $(tier_$*_dirs); do \
|
||||
$(UPDATE_TITLE) \
|
||||
$(MAKE) -C $$d libs; \
|
||||
done
|
||||
|
||||
tools_tier_%:
|
||||
@echo "$@"
|
||||
@$(MAKE) $(addsuffix /Makefile,$(filter-out $(STATIC_MAKEFILES),$(tier_$*_dirs)))
|
||||
@$(EXIT_ON_ERROR) \
|
||||
for d in $(tier_$*_dirs); do \
|
||||
$(UPDATE_TITLE) \
|
||||
$(MAKE) -C $$d tools; \
|
||||
done
|
||||
|
||||
ifdef MOZ_ENABLE_LIBXUL
|
||||
tier_50:
|
||||
@echo "$@: $($@_dirs)"
|
||||
$(MAKE) export_tier_50
|
||||
$(MAKE) libs_tier_50
|
||||
$(MAKE) tools_tier_2
|
||||
$(MAKE) tools_tier_9
|
||||
$(MAKE) tools_tier_50
|
||||
endif
|
||||
|
||||
tier_%:
|
||||
@echo "$@: $($@_dirs)"
|
||||
@$(EXIT_ON_ERROR) \
|
||||
for d in $($@_dirs); do \
|
||||
$(UPDATE_TITLE) \
|
||||
if test ! -f $$d/Makefile; then \
|
||||
$(PERL) $(AUTOCONF_TOOLS)/make-makefile -t $(topsrcdir) -d $(DEPTH) $(CYGWIN_TOPSRCDIR) $$d/Makefile; \
|
||||
fi; \
|
||||
$(MAKE) -C $$d export; \
|
||||
done ; \
|
||||
for d in $($@_dirs); do $(UPDATE_TITLE) \
|
||||
$(MAKE) -C $$d libs; \
|
||||
done
|
||||
$(MAKE) export_$@
|
||||
$(MAKE) libs_$@
|
||||
|
||||
#
|
||||
# Individual modules
|
||||
|
|
Загрузка…
Ссылка в новой задаче