From 8a38ab00c99a9111769295204f420b46917d1067 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Wed, 19 Sep 2007 21:27:00 +0000 Subject: [PATCH] The include-pass has to be initiated if LOCAL_CONFIG_H is set for Sysless and RTEMS rules. darcs-hash:20070919212706-ff715-2d69d9047c40f84328e35014f4b4049a93e2cd4c.gz --- snippets/rtems | 2 +- snippets/sysless | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/snippets/rtems b/snippets/rtems index c1005c3..006a3f2 100644 --- a/snippets/rtems +++ b/snippets/rtems @@ -265,7 +265,7 @@ endif #===================================================================== -$(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, include-pass,$(USER_OBJS_DIR),,$(include_HEADERS)$(nobase_include_HEADERS)$(renamed_include_HEADERS)$(config_include_HEADERS)$(LOCAL_CONFIG_H))) $(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES))) $(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS)$(utils_PROGRAMS))) diff --git a/snippets/sysless b/snippets/sysless index 54f7e84..ed55141 100644 --- a/snippets/sysless +++ b/snippets/sysless @@ -205,7 +205,7 @@ 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),,$(include_HEADERS)$(nobase_include_HEADERS)$(renamed_include_HEADERS)$(lib_LDSCRIPTS)$(config_include_HEADERS))) +$(eval $(call omk_pass_template, include-pass, $(LOCAL_BUILD_DIR),,$(include_HEADERS)$(nobase_include_HEADERS)$(renamed_include_HEADERS)$(lib_LDSCRIPTS)$(config_include_HEADERS)$(LOCAL_CONFIG_H))) $(eval $(call omk_pass_template, library-pass, $(LOCAL_BUILD_DIR),TARGET_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES)$(lib_obj_SOURCES))) $(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))) -- 2.39.2