Pass definition simplified by not using -local target

[omk.git] / snippets / config_h

diff --git a/snippets/config_h b/snippets/config_h
index 0e25ad9e1b49deac7b02ee0d529e92ba1c3f3abc..c78737e1c144d323a86ed83e94fa764a19cc0556 100644 (file)
--- a/snippets/config_h
+++ b/snippets/config_h
@@ -37,7 +37,8 @@ ifdef LOCAL_CONFIG_H
 
 # This must be declared after the default cflags are assigned!
 # Override is used to override command line assignemnt.
-override CFLAGS += -I.
+override CFLAGS += -I $(USER_OBJS_DIR)
+override kernel_INCLUDES += -I $(KERN_OBJS_DIR)
 $(eval $(call BUILD_CONFIG_H_template,$(USER_OBJS_DIR),$(USER_OBJS_DIR)/$(LOCAL_CONFIG_H),default_CONFIG,_LOCAL_CONFIG_H) )
 
 endif
@@ -52,7 +53,7 @@ _$(basename $(notdir $(confh)))_H \
 config_h_stamp_files = $(addprefix $(USER_OBJS_DIR)/,$(notdir $(addsuffix .stamp,$(config_include_HEADERS) $(LOCAL_CONFIG_H))))
 
 # Add some hooks to standard passes
-include-pass-local: $(config_h_stamp_files)
+include-pass-local: $(config_h_stamp_files) # TODO remove -local
 
 ifneq ($(KERN_CONFIG_HEADERS_REQUIRED),)
 
@@ -67,11 +68,11 @@ _$(basename $(notdir $(confh)))_H \
 kern_config_h_stamp_files = $(addprefix $(KERN_OBJS_DIR)/,$(notdir $(addsuffix .stamp,$(config_include_HEADERS) $(LOCAL_CONFIG_H))))
 
 # Add some hooks to standard passes
-include-pass-local: $(kern_config_h_stamp_files)
+include-pass-local: $(kern_config_h_stamp_files) # TODO remove -local
 
 endif
 
-clean-local: clean-local-config-h
+clean-local: clean-local-config-h # TODO remove -local
 
 clean-local-config-h:
        @$(foreach confh,$(config_h_stamp_files) $(kern_config_h_stamp_files),\