Bug 1011816 - Avoid install targets race condition in toolkit/devtools/gcli. r=mshal

While at it, convert the libs:: rule to install targets
This commit is contained in:
Mike Hommey 2014-05-20 08:47:59 +09:00
parent 083439f35f
commit ee17fdfb59

View File

@ -6,47 +6,30 @@ gcli_commands_internal_FILES = $(wildcard $(srcdir)/commands/*)
gcli_commands_internal_DEST = $(FINAL_TARGET)/modules/devtools/gcli/commands
INSTALL_TARGETS += gcli_commands_internal
gcli_commands_FILES = $(wildcard $(srcdir)/source/lib/gcli/commands/*)
gcli_commands_DEST = $(FINAL_TARGET)/modules/devtools/gcli/commands
INSTALL_TARGETS += gcli_commands
subdirs = \
commands \
connectors \
converters \
fields \
languages \
mozui \
types \
ui \
util \
$(NULL)
gcli_connectors_FILES = $(wildcard $(srcdir)/source/lib/gcli/connectors/*)
gcli_connectors_DEST = $(FINAL_TARGET)/modules/devtools/gcli/connectors
INSTALL_TARGETS += gcli_connectors
define subdir_files
gcli_$1_FILES = $$(wildcard $$(srcdir)/source/lib/gcli/$1/*)
gcli_$1_DEST = $$(FINAL_TARGET)/modules/devtools/gcli/$1
INSTALL_TARGETS += gcli_$1
endef
gcli_converters_FILES = $(wildcard $(srcdir)/source/lib/gcli/converters/*)
gcli_converters_DEST = $(FINAL_TARGET)/modules/devtools/gcli/converters
INSTALL_TARGETS += gcli_converters
$(foreach subdir,$(subdirs),$(eval $(call subdir_files,$(subdir))))
gcli_fields_FILES = $(wildcard $(srcdir)/source/lib/gcli/fields/*)
gcli_fields_DEST = $(FINAL_TARGET)/modules/devtools/gcli/fields
INSTALL_TARGETS += gcli_fields
gcli_languages_FILES = $(wildcard $(srcdir)/source/lib/gcli/languages/*)
gcli_languages_DEST = $(FINAL_TARGET)/modules/devtools/gcli/languages
INSTALL_TARGETS += gcli_languages
gcli_mozui_FILES = $(wildcard $(srcdir)/source/lib/gcli/mozui/*)
gcli_mozui_DEST = $(FINAL_TARGET)/modules/devtools/gcli/mozui
INSTALL_TARGETS += gcli_mozui
gcli_types_FILES = $(wildcard $(srcdir)/source/lib/gcli/types/*)
gcli_types_DEST = $(FINAL_TARGET)/modules/devtools/gcli/types
INSTALL_TARGETS += gcli_types
gcli_ui_FILES = $(wildcard $(srcdir)/source/lib/gcli/ui/*)
gcli_ui_DEST = $(FINAL_TARGET)/modules/devtools/gcli/ui
INSTALL_TARGETS += gcli_ui
gcli_util_FILES = $(wildcard $(srcdir)/source/lib/gcli/util/*)
gcli_util_DEST = $(FINAL_TARGET)/modules/devtools/gcli/util
INSTALL_TARGETS += gcli_util
gcli_root_FILES = $(wildcard $(srcdir)/source/lib/gcli/*)
gcli_root_FILES = $(filter-out $(addprefix $(srcdir)/source/lib/gcli/,$(subdirs)),$(wildcard $(srcdir)/source/lib/gcli/*))
gcli_root_DEST = $(FINAL_TARGET)/modules/devtools/gcli
INSTALL_TARGETS += gcli_root
include $(topsrcdir)/config/rules.mk
libs::
$(INSTALL) $(IFLAGS1) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
gcli_jsm_FILES = $(wildcard $(srcdir)/*.jsm)
gcli_jsm_DEST = $(FINAL_TARGET)/modules/devtools
INSTALL_TARGETS += gcli_jsm