Minor updates and cleanups to linux rules.

darcs-hash:20060626141933-f2ef6-eda5a9755c7080412bd9b55ed31530da9dbe7327.gz

diff --git a/snippets/linux b/snippets/linux
index e0182d8a8f50d55d0af28adee0359fe045790a14..ba2aa1151f09fe774defb86b949f3dc4a752d002 100644 (file)
--- a/snippets/linux
+++ b/snippets/linux
@@ -31,13 +31,6 @@
 #CONFIG_RTLINUX = y
 #OCERA_DIR := $(shell ( cd -L $(MAKERULES_DIR)/../../.. ; pwd -L ) )
 
-# # Check and include real OCERA style Makefile.omk now
-# ifndef OMK_INCLUDED
-# include $(SOURCES_DIR)/Makefile.omk
-# OMK_INCLUDED := 1
-# endif
-# FIXME: Maybe the order of this is important. Is it wrong when this is located in base?
-
 #CFLAGS += -ggdb
 CFLAGS += -O2 
 CFLAGS += -Wall
@@ -584,12 +577,9 @@ $(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLAT
 $(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)))
 
-OTHER_PASSES = dep clean install include-pass
+OTHER_PASSES = clean install include-pass
 $(eval $(call omk_pass_template,$(OTHER_PASSES), $(USER_OBJS_DIR)))
 
-# FIXME: Are the 'dep' and 'install' passes usefull?
-dep-local:
-
 # Create directories only for the first time
 ifndef CHECK_DIR_DONE
 check-dir = check-dir
@@ -609,10 +599,10 @@ check-dir:
        @$(call mkdir_def,$(KERN_MODULES_DIR))
        @$(call mkdir_def,$(KERN_MODPOST_DIR))
 
-install-local:
+install-local:                 # TODO
 
 include-pass-local:
-       @$(call mkdir_def,$(USER_INCLUDE_DIR))
+#      @$(call mkdir_def,$(USER_INCLUDE_DIR))
        @$(foreach f, $(include_HEADERS), cmp --quiet $(SOURCES_DIR)/$(f) $(USER_INCLUDE_DIR)/$(notdir $(f)) \
           || cp $(CPHEADER_FLAGS) $(SOURCES_DIR)/$(f) $(USER_INCLUDE_DIR)/$(notdir $(f)) || exit 1 ; )
        @$(foreach f, $(nobase_include_HEADERS), cmp --quiet $(SOURCES_DIR)/$(f) $(USER_INCLUDE_DIR)/$(f) \
@@ -622,7 +612,7 @@ include-pass-local:
           cmp --quiet $(SOURCES_DIR)/$${srcfname} $(USER_INCLUDE_DIR)/$${destfname} \
           || ( mkdir -p `dirname $(USER_INCLUDE_DIR)/$${destfname}` && cp $(CPHEADER_FLAGS) $(SOURCES_DIR)/$${srcfname} $(USER_INCLUDE_DIR)/$${destfname} ) || exit 1 ; )
 # Kernel and RT-Linux stuff
-       @$(call mkdir_def,$(KERN_INCLUDE_DIR))
+#      @$(call mkdir_def,$(KERN_INCLUDE_DIR))
        @$(foreach f, $(kernel_HEADERS) $(rtlinux_HEADERS), cmp --quiet $(SOURCES_DIR)/$(f) $(KERN_INCLUDE_DIR)/$(notdir $(f)) \
           || cp $(CPHEADER_FLAGS) $(SOURCES_DIR)/$(f) $(KERN_INCLUDE_DIR)/$(notdir $(f)) || exit 1 ; )
        @$(foreach f, $(nobase_kernel_HEADERS) $(nobase_rtlinux_HEADERS), cmp --quiet $(SOURCES_DIR)/$(f) $(KERN_INCLUDE_DIR)/$(f) \