From 05b5b0ef1b6baba4789645daf8cb3c750a34a01c Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Tue, 4 Jul 2006 18:46:00 +0000 Subject: [PATCH] The condition for entering local directory in a pass was simplified. darcs-hash:20060704184603-f2ef6-f4f4f4b89baa01c1831db249321579c97911748b.gz --- snippets/linux | 24 ++++++------------------ snippets/rtems | 10 +++++----- snippets/sysless | 10 +++++----- 3 files changed, 16 insertions(+), 28 deletions(-) diff --git a/snippets/linux b/snippets/linux index a6f8fc7..90e8926 100644 --- a/snippets/linux +++ b/snippets/linux @@ -550,8 +550,8 @@ endif #===================================================================== -$(eval $(call omk_pass_template, kernel-lib-pass,$(KERN_OBJS_DIR),KERN_RULE_TEMPLATES=y,-n "$(kernel_LIBRARIES)$(rtlinux_LIBRARIES)")) -$(eval $(call omk_pass_template, kernel-mod-pass,$(KERN_OBJS_DIR),KERN_RULE_TEMPLATES=y,-n "$(kernel_MODULES)$(rtlinux_MODULES)")) +$(eval $(call omk_pass_template, kernel-lib-pass,$(KERN_OBJS_DIR),KERN_RULE_TEMPLATES=y,$(kernel_LIBRARIES)$(rtlinux_LIBRARIES))) +$(eval $(call omk_pass_template, kernel-mod-pass,$(KERN_OBJS_DIR),KERN_RULE_TEMPLATES=y,$(kernel_MODULES)$(rtlinux_MODULES))) kernel-modpost-pass: +@if [ -e "$(KERN_MODPOST_DIR)/module-changes" -o -e "$(KERN_MODPOST_DIR)/modpost-running" ] ; \ @@ -560,24 +560,12 @@ kernel-modpost-pass: -f $(SOURCES_DIR)/Makefile KERN_RULE_TEMPLATES=y KERN_MODPOST_PASS=y $(@:%=%-local) ; \ fi -define qt_subpass - +@$(foreach dir, $(QT_SUBDIRS), $(call mkdir_def,$(USER_OBJS_DIR)/$(dir)) ; \ - if [ "$@" != "binary-pass" ] ; then exit 0 ; fi ; \ - if [ ! -e $(SOURCES_DIR)/$(dir)/Makefile ] ; then \ - ( cd $(SOURCES_DIR)/$(dir) ; $$QTDIR/bin/qmake TOP_DIR=$(MAKERULES_DIR) \ - RELATIVE_DIR=$(RELATIVE_PREFIX)$(dir) QTDIR=$(QTDIR) CC=$(CC) \ - CXX=$(CXX) || exit 1 ;) ; fi ; \ - $(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(dir) \ - RELATIVE_DIR=$(RELATIVE_PREFIX)$(dir) -C $(SOURCES_DIR)/$(dir) \ - -f $(SOURCES_DIR)/$(dir)/Makefile || exit 1 ;) -endef - -$(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,-n "$(lib_LIBRARIES)$(shared_LIBRARIES)")) -$(eval $(call omk_pass_template, utils-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,-n "$(utils_PROGRAMS)")) -$(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,-n "$(bin_PROGRAMS)$(QT_SUBDIRS)",$(qt_subpass))) +$(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES))) +$(eval $(call omk_pass_template, utils-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(utils_PROGRAMS))) +$(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS))) OTHER_PASSES = clean install include-pass -$(eval $(call omk_pass_template,$(OTHER_PASSES), $(USER_OBJS_DIR))) +$(eval $(call omk_pass_template,$(OTHER_PASSES),$(USER_OBJS_DIR),,always)) # Create directories only for the first time ifndef CHECK_DIR_DONE diff --git a/snippets/rtems b/snippets/rtems index 520b42d..567f765 100644 --- a/snippets/rtems +++ b/snippets/rtems @@ -265,12 +265,12 @@ endif #===================================================================== -$(eval $(call omk_pass_template, include-pass,$(USER_OBJS_DIR),,-n "$(include_HEADERS)$(nobase_include_HEADERS)$(renamed_include_HEADERS)$(config_include_HEADERS)")) -$(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,-n "$(lib_LIBRARIES)$(shared_LIBRARIES)")) -$(eval $(call omk_pass_template, utils-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,-n "$(utils_PROGRAMS)")) -$(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,-n "$(bin_PROGRAMS)")) +$(eval $(call omk_pass_template, include-pass,$(USER_OBJS_DIR),,$(include_HEADERS)$(nobase_include_HEADERS)$(renamed_include_HEADERS)$(config_include_HEADERS))) +$(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES))) +$(eval $(call omk_pass_template, utils-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(utils_PROGRAMS))) +$(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS))) -$(eval $(call omk_pass_template,clean,$(USER_OBJS_DIR))) +$(eval $(call omk_pass_template,clean,$(USER_OBJS_DIR),,always)) check-dir: @$(call mkdir_def,$(USER_INCLUDE_DIR)) diff --git a/snippets/sysless b/snippets/sysless index e2c50f3..957b494 100644 --- a/snippets/sysless +++ b/snippets/sysless @@ -189,13 +189,13 @@ run: run-$(firstword $(link_VARIANTS)) # Generate pass rules from generic templates OTHER_PASSES = dep clean install -$(eval $(call omk_pass_template, include-pass, $(LOCAL_BUILD_DIR),,-n "$(include_HEADERS)$(nobase_include_HEADERS)$(renamed_include_HEADERS)$(lib_LDSCRIPTS)$(config_include_HEADERS)")) -$(eval $(call omk_pass_template, library-pass, $(LOCAL_BUILD_DIR),TARGET_RULE_TEMPLATES=y, -n "$(lib_LIBRARIES)$(shared_LIBRARIES)$(lib_OBJS)")) -$(eval $(call omk_pass_template, binary-pass, $(LOCAL_BUILD_DIR),TARGET_RULE_TEMPLATES=y, -n "$(bin_PROGRAMS)")) -$(eval $(call omk_pass_template, utils-pass, $(LOCAL_BUILD_DIR),HOST_RULE_TEMPLATES=y,-n "$(utils_PROGRAMS)")) +$(eval $(call omk_pass_template, include-pass, $(LOCAL_BUILD_DIR),,$(include_HEADERS)$(nobase_include_HEADERS)$(renamed_include_HEADERS)$(lib_LDSCRIPTS)$(config_include_HEADERS))) +$(eval $(call omk_pass_template, library-pass, $(LOCAL_BUILD_DIR),TARGET_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES)$(lib_OBJS))) +$(eval $(call omk_pass_template, binary-pass, $(LOCAL_BUILD_DIR),TARGET_RULE_TEMPLATES=y,$(bin_PROGRAMS))) +$(eval $(call omk_pass_template, utils-pass, $(LOCAL_BUILD_DIR),HOST_RULE_TEMPLATES=y,$(utils_PROGRAMS))) -$(eval $(call omk_pass_template,$(OTHER_PASSES),$(LOCAL_BUILD_DIR))) +$(eval $(call omk_pass_template,$(OTHER_PASSES),$(LOCAL_BUILD_DIR),,always)) dep-local: -- 2.39.2