]> git.saurik.com Git - apple/xnu.git/blobdiff - makedefs/MakeInc.rule
projects / apple / xnu.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
xnu-792.6.70.tar.gz
[apple/xnu.git] / makedefs / MakeInc.rule
diff --git a/makedefs/MakeInc.rule b/makedefs/MakeInc.rule
index fc63338f65685d60cf002da01145416cb085bf76..bfd896d290996d459bdcbb30056a6335a5ed5eb4 100644 (file)
--- a/makedefs/MakeInc.rule
+++ b/makedefs/MakeInc.rule
@@ -2,10 +2,6 @@
 # Generic Install rules
 #
 
 # Generic Install rules
 #
 
-#
-# gvdl: Let's optionally have a different list of local installs and 
-# regular installs.
-#
 ifndef INSTALL_MI_LCL_LIST
     INSTALL_MI_LCL_LIST = $(INSTALL_MI_LIST)
 endif
 ifndef INSTALL_MI_LCL_LIST
     INSTALL_MI_LCL_LIST = $(INSTALL_MI_LIST)
 endif
@@ -22,103 +18,138 @@ ifndef INSTALL_MD_LCL_GEN_LIST
     INSTALL_MD_LCL_GEN_LIST = $(INSTALL_MD_GEN_LIST)
 endif
 
     INSTALL_MD_LCL_GEN_LIST = $(INSTALL_MD_GEN_LIST)
 endif
 
-ifeq ($(INCR_INSTALLHDRS), TRUE)
+ifndef INSTALL_KF_MI_LCL_LIST
+    INSTALL_KF_MI_LCL_LIST = $(EXPORT_MI_LIST)
+endif
+
+ifndef INSTALL_KF_MI_LCL_GEN_LIST
+    INSTALL_KF_MI_LCL_GEN_LIST = $(EXPORT_MI_GEN_LIST)
+endif
 
 
-INSTALL_MI_INC_FILES = $(addprefix $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR)/, $(INSTALL_MI_LIST))
-INSTALL_MI_GEN_INC_FILES = $(addprefix $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR)/, $(INSTALL_MI_GEN_LIST))
-INSTALL_MI_LCL_FILES = $(addprefix $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR)/, $(INSTALL_MI_LCL_LIST))
-INSTALL_MI_GEN_LCL_FILES = $(addprefix $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR)/, $(INSTALL_MI_LCL_GEN_LIST))
+ifndef INSTALL_KF_MD_LCL_LIST
+    INSTALL_KF_MD_LCL_LIST = $(EXPORT_MD_LIST)
+endif
+
+ifndef INSTALL_KF_MD_LCL_GEN_LIST
+    INSTALL_KF_MD_LCL_GEN_LIST = $(EXPORT_MD_GEN_LIST)
+endif
+
+ifndef INSTALL_KF_MI_LIST
+    INSTALL_KF_MI_LIST = $(EXPORT_MI_LIST)
+endif
 
 
-$(INSTALL_MI_INC_FILES) $(INSTALL_MI_GEN_INC_FILES): $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR)/% : %
+ifndef INSTALL_KF_MI_GEN_LIST
+    INSTALL_KF_MI_GEN_LIST = $(EXPORT_MI_GEN_LIST)
+endif
+
+ifndef INSTALL_KF_MD_LIST
+    INSTALL_KF_MD_LIST = $(EXPORT_MD_LIST)
+endif
+
+ifndef INSTALL_KF_MD_GEN_LIST
+    INSTALL_KF_MD_GEN_LIST = $(EXPORT_MD_GEN_LIST)
+endif
+
+INSTALL_MI_GEN_FILES = $(addprefix $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR)/, $(INSTALL_MI_GEN_LIST))
+
+$(INSTALL_MI_GEN_FILES): $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR)/% : %
        @true echo Installing $< in $(dir $@);                  \
        @true echo Installing $< in $(dir $@);                  \
-       $(MKDIR) $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR);        \
+       [ -d $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR) ] ||$(MKDIR) $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR);        \
        filename=`$(BASENAME) $<`;                              \
        filename_strip=$(addsuffix .strip,$${filename});        \
        $(RM) $(RMFLAGS) $@;                                    \
        filename=`$(BASENAME) $<`;                              \
        filename_strip=$(addsuffix .strip,$${filename});        \
        $(RM) $(RMFLAGS) $@;                                    \
-       $(MKDIR) ./incdir;                                      \
-       echo garbage > ./incdir/$${filename_strip};             \
-       $(UNIFDEF) -UKERNEL_PRIVATE -UDRIVER_PRIVATE            \
-               $< > ./incdir/$${filename} ||                   \
-               $(DECOMMENT) ./incdir/$${filename} r >          \
-               ./incdir/$${filename_strip};                    \
-       if [ -s ./incdir/$${filename_strip} ];                  \
+       [ -d ./incmidir ] || $(MKDIR) ./incmidir;                       \
+       echo garbage > ./incmidir/$${filename_strip};           \
+       $(UNIFDEF) $(SINCFRAME_UNIFDEF)                         \
+               $< > ./incmidir/$${filename} ||                 \
+               $(DECOMMENT) ./incmidir/$${filename} r >                \
+               ./incmidir/$${filename_strip};                  \
+       if [ -s ./incmidir/$${filename_strip} ];                        \
        then (                                                  \
        then (                                                  \
-               install $(INSTALL_FLAGS) ./incdir/$${filename} $(dir $@);\
+               install $(INSTALL_FLAGS) ./incmidir/$${filename} $(dir $@);\
        );                                                      \
        else                                                    \
                echo Header file $< not exported;               \
        );                                                      \
        else                                                    \
                echo Header file $< not exported;               \
-       fi;                                                     \
-       $(RM) -rf ./incdir;
+       fi;
 
 
-$(INSTALL_MI_LCL_FILES) $(INSTALL_MI_GEN_LCL_FILES): $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR)/% : %
-       @true echo Installing $< in $(dir $@);                  \
-       $(MKDIR) $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR);        \
+INSTALL_KF_MI_GEN_FILES = $(addprefix  $(DSTROOT)/$(KINCDIR)/$(EXPORT_MI_DIR)/, $(INSTALL_KF_MI_GEN_LIST))
+
+$(INSTALL_KF_MI_GEN_FILES): $(DSTROOT)/$(KINCDIR)/$(EXPORT_MI_DIR)/% : %
+       @true echo Installing $< in $(midir $@);                        \
+       [ -d $(DSTROOT)/$(KINCDIR)/$(EXPORT_MI_DIR) ] ||$(MKDIR) $(DSTROOT)/$(KINCDIR)/$(EXPORT_MI_DIR);        \
+       filename=`$(BASENAME) $<`;                              \
+       filename_strip=$(addsuffix .strip,$${filename});        \
        $(RM) $(RMFLAGS) $@;                                    \
        $(RM) $(RMFLAGS) $@;                                    \
-       install $(INSTALL_FLAGS) $< $(dir $@);
+       [ -d ./kincmidir ] || $(MKDIR) ./kincmidir;                     \
+       echo garbage > ./kincmidir/$${filename_strip};          \
+       $(UNIFDEF) $(KINCFRAME_UNIFDEF)                         \
+               $< > ./kincmidir/$${filename} ||                        \
+               $(DECOMMENT) ./kincmidir/$${filename} r >               \
+               ./kincmidir/$${filename_strip};                 \
+       if [ -s ./kincmidir/$${filename_strip} ];                       \
+       then (                                                  \
+               install $(INSTALL_FLAGS) ./kincmidir/$${filename} $(dir $@);\
+       );                                                      \
+       else                                                    \
+               echo Header file $< not exported;               \
+       fi;
 
 
-INSTALL_MD_INC_FILES = $(addprefix $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR)/, $(INSTALL_MD_LIST))
-INSTALL_MD_GEN_INC_FILES = $(addprefix $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR)/, $(INSTALL_MD_GEN_LIST))
-INSTALL_MD_LCL_FILES = $(addprefix $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR)/, $(INSTALL_MD_LCL_LIST))
-INSTALL_MD_GEN_LCL_FILES = $(addprefix $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR)/, $(INSTALL_MD_LCL_GEN_LIST))
+INSTALL_MI_GEN_LCL_FILES = $(addprefix $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR)/, $(INSTALL_MI_LCL_GEN_LIST))
 
 
-$(INSTALL_MD_INC_FILES) $(INSTALL_MD_GEN_INC_FILES): $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR)/% : %
+$(INSTALL_MI_GEN_LCL_FILES): $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR)/% : %
        @true echo Installing $< in $(dir $@);                  \
        @true echo Installing $< in $(dir $@);                  \
-       $(MKDIR) $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR);        \
+       [ -d $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR) ] ||$(MKDIR) $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR);        \
        filename=`$(BASENAME) $<`;                              \
        filename_strip=$(addsuffix .strip,$${filename});        \
        $(RM) $(RMFLAGS) $@;                                    \
        filename=`$(BASENAME) $<`;                              \
        filename_strip=$(addsuffix .strip,$${filename});        \
        $(RM) $(RMFLAGS) $@;                                    \
-       $(MKDIR) ./incdir;                                      \
-       echo garbage > ./incdir/$${filename_strip};             \
-       $(UNIFDEF) -UKERNEL_PRIVATE -UDRIVER_PRIVATE            \
-               $< > ./incdir/$${filename} ||                   \
-               $(DECOMMENT) ./incdir/$${filename} r >          \
-               ./incdir/$${filename_strip};                    \
-       if [ -s ./incdir/$${filename_strip} ];                  \
+       [ -d ./pincmidir ] || $(MKDIR) ./pincmidir;                     \
+       echo garbage > ./pincmidir/$${filename_strip};          \
+       $(UNIFDEF) $(SPINCFRAME_UNIFDEF)                        \
+               $< > ./pincmidir/$${filename} ||                        \
+               $(DECOMMENT) ./pincmidir/$${filename} r >               \
+               ./pincmidir/$${filename_strip};                 \
+       if [ -s ./pincmidir/$${filename_strip} ];                       \
        then (                                                  \
        then (                                                  \
-               install $(INSTALL_FLAGS) ./incdir/$${filename} $(dir $@);\
+               install $(INSTALL_FLAGS) ./pincmidir/$${filename} $(dir $@);\
        );                                                      \
        else                                                    \
                echo Header file $< not exported;               \
        );                                                      \
        else                                                    \
                echo Header file $< not exported;               \
-       fi;                                                     \
-       $(RM) -rf ./incdir;
+       fi;
+
+INSTALL_KF_MI_LCL_GEN_FILES = $(addprefix  $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MI_DIR)/, $(INSTALL_KF_MI_LCL_GEN_LIST))
 
 
-$(INSTALL_MD_LCL_FILES) $(INSTALL_MD_GEN_LCL_FILES): $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR)/% : %
+$(INSTALL_KF_MI_LCL_GEN_FILES): $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MI_DIR)/% : %
        @true echo Installing $< in $(dir $@);                  \
        @true echo Installing $< in $(dir $@);                  \
-       $(MKDIR) $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR);        \
+       [ -d $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MI_DIR) ] ||$(MKDIR) $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MI_DIR);      \
+       filename=`$(BASENAME) $<`;                              \
+       filename_strip=$(addsuffix .strip,$${filename});        \
        $(RM) $(RMFLAGS) $@;                                    \
        $(RM) $(RMFLAGS) $@;                                    \
-       install $(INSTALL_FLAGS) $< $(dir $@);
-
-setup_installhdrs_mi: 
-       @echo "[ $(SOURCE) ] make setup_installhdrs_mi $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
-
-do_installhdrs_mi: $(INSTALL_MI_INC_FILES) $(INSTALL_MI_GEN_INC_FILES) $(INSTALL_MI_LCL_FILES) $(INSTALL_MI_GEN_LCL_FILES)
-       @echo "[ $(SOURCE) ] make do_installhdrs_mi $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
-
-setup_installhdrs_md:
-       @echo "[ $(SOURCE) ] make setup_installhdrs_md $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
-
-do_installhdrs_md: $(INSTALL_MD_INC_FILES) $(INSTALL_MD_GEN_INC_FILES) $(INSTALL_MD_LCL_FILES) $(INSTALL_MD_GEN_LCL_FILES)
-       @echo "[ $(SOURCE) ] make do_installhdrs_md $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
-
-else
-
-INSTALL_MI_INC_FILES = $(addprefix $(SOURCE), $(INSTALL_MI_LIST))
-INSTALL_MI_GEN_INC_FILES = $(addprefix $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR)/, $(INSTALL_MI_GEN_LIST))
-
-INSTALL_MI_LCL_FILES = $(addprefix $(SOURCE), $(INSTALL_MI_LCL_LIST))
-INSTALL_MI_GEN_LCL_FILES = $(addprefix $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR)/, $(INSTALL_MI_LCL_GEN_LIST))
+       [ -d ./kpincmidir ] || $(MKDIR) ./kpincmidir;                   \
+       echo garbage > ./kpincmidir/$${filename_strip};         \
+       $(UNIFDEF) $(KPINCFRAME_UNIFDEF)                        \
+               $< > ./kpincmidir/$${filename} ||                       \
+               $(DECOMMENT) ./kpincmidir/$${filename} r >              \
+               ./kpincmidir/$${filename_strip};                        \
+       if [ -s ./kpincmidir/$${filename_strip} ];                      \
+       then (                                                  \
+               install $(INSTALL_FLAGS) ./kpincmidir/$${filename} $(dir $@);\
+       );                                                      \
+       else                                                    \
+               echo Header file $< not exported;               \
+       fi;
 
 
+INSTALL_MD_GEN_INC_FILES = $(addprefix $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR)/, $(INSTALL_MD_GEN_LIST))
 
 
-$(INSTALL_MI_GEN_INC_FILES): $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR)/% : %
+$(INSTALL_MD_GEN_INC_FILES): $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR)/% : %
        @true echo Installing $< in $(dir $@);                  \
        @true echo Installing $< in $(dir $@);                  \
-       $(MKDIR) $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR);        \
+       [ -d $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR) ] ||$(MKDIR) $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR);        \
        filename=`$(BASENAME) $<`;                              \
        filename_strip=$(addsuffix .strip,$${filename});        \
        $(RM) $(RMFLAGS) $@;                                    \
        filename=`$(BASENAME) $<`;                              \
        filename_strip=$(addsuffix .strip,$${filename});        \
        $(RM) $(RMFLAGS) $@;                                    \
-       $(MKDIR) ./incdir;                                      \
+       [ -d ./incdir ] || $(MKDIR) ./incdir;                   \
        echo garbage > ./incdir/$${filename_strip};             \
        echo garbage > ./incdir/$${filename_strip};             \
-       $(UNIFDEF) -UKERNEL_PRIVATE -UDRIVER_PRIVATE            \
-               $< > ./incdir/$${filename} ||                   \
+       $(UNIFDEF) $(SINCFRAME_UNIFDEF)                         \
+               $< > ./incdir/$${filename} ||           \
                $(DECOMMENT) ./incdir/$${filename} r >          \
                ./incdir/$${filename_strip};                    \
        if [ -s ./incdir/$${filename_strip} ];                  \
                $(DECOMMENT) ./incdir/$${filename} r >          \
                ./incdir/$${filename_strip};                    \
        if [ -s ./incdir/$${filename_strip} ];                  \
@@ -127,102 +158,188 @@ $(INSTALL_MI_GEN_INC_FILES): $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR)/% : %
        );                                                      \
        else                                                    \
                echo Header file $< not exported;               \
        );                                                      \
        else                                                    \
                echo Header file $< not exported;               \
-       fi;                                                     \
-       $(RM) -rf ./incdir;
+       fi;
 
 
-$(INSTALL_MI_GEN_LCL_FILES): $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR)/% : %
+INSTALL_KF_MD_GEN_FILES = $(addprefix $(DSTROOT)/$(KINCDIR)/$(EXPORT_MD_DIR)/, $(INSTALL_KF_MD_GEN_LIST))
+
+$(INSTALL_KF_MD_GEN_FILES): $(DSTROOT)/$(KINCDIR)/$(EXPORT_MD_DIR)/% : %
        @true echo Installing $< in $(dir $@);                  \
        @true echo Installing $< in $(dir $@);                  \
-       $(MKDIR) $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR);        \
+       [ -d $(DSTROOT)/$(KINCDIR)/$(EXPORT_MD_DIR) ] ||$(MKDIR) $(DSTROOT)/$(KINCDIR)/$(EXPORT_MD_DIR);        \
+       filename=`$(BASENAME) $<`;                              \
+       filename_strip=$(addsuffix .strip,$${filename});        \
        $(RM) $(RMFLAGS) $@;                                    \
        $(RM) $(RMFLAGS) $@;                                    \
-       install $(INSTALL_FLAGS) $< $(dir $@);
-
-INSTALL_MD_INC_FILES = $(addprefix $(SOURCE), $(INSTALL_MD_LIST))
-INSTALL_MD_GEN_INC_FILES = $(addprefix $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR)/, $(INSTALL_MD_GEN_LIST))
+       [ -d ./kincdir ] || $(MKDIR) ./kincdir;                 \
+       echo garbage > ./kincdir/$${filename_strip};            \
+       $(UNIFDEF) $(KINCFRAME_UNIFDEF)                         \
+               $< > ./kincdir/$${filename} ||                  \
+               $(DECOMMENT) ./kincdir/$${filename} r >         \
+               ./kincdir/$${filename_strip};                   \
+       if [ -s ./kincdir/$${filename_strip} ];                 \
+       then (                                                  \
+               install $(INSTALL_FLAGS) ./kincdir/$${filename} $(dir $@);\
+       );                                                      \
+       else                                                    \
+               echo Header file $< not exported;               \
+       fi;
 
 INSTALL_MD_LCL_FILES = $(addprefix $(SOURCE), $(INSTALL_MD_LCL_LIST))
 INSTALL_MD_GEN_LCL_FILES = $(addprefix $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR)/, $(INSTALL_MD_LCL_GEN_LIST))
 
 
 INSTALL_MD_LCL_FILES = $(addprefix $(SOURCE), $(INSTALL_MD_LCL_LIST))
 INSTALL_MD_GEN_LCL_FILES = $(addprefix $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR)/, $(INSTALL_MD_LCL_GEN_LIST))
 
-$(INSTALL_MD_GEN_INC_FILES): $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR)/% : %
+$(INSTALL_MD_GEN_LCL_FILES): $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR)/% : %
        @true echo Installing $< in $(dir $@);                  \
        @true echo Installing $< in $(dir $@);                  \
-       $(MKDIR) $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR);        \
+       [ -d $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR) ] ||$(MKDIR) $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR);        \
        filename=`$(BASENAME) $<`;                              \
        filename_strip=$(addsuffix .strip,$${filename});        \
        $(RM) $(RMFLAGS) $@;                                    \
        filename=`$(BASENAME) $<`;                              \
        filename_strip=$(addsuffix .strip,$${filename});        \
        $(RM) $(RMFLAGS) $@;                                    \
-       $(MKDIR) ./incdir;                                      \
-       echo garbage > ./incdir/$${filename_strip};             \
-       $(UNIFDEF) -UKERNEL_PRIVATE -UDRIVER_PRIVATE            \
-               $< > ./incdir/$${filename} ||           \
-               $(DECOMMENT) ./incdir/$${filename} r >          \
-               ./incdir/$${filename_strip};                    \
-       if [ -s ./incdir/$${filename_strip} ];                  \
+       [ -d ./pincdir ] || $(MKDIR) ./pincdir;                 \
+       echo garbage > ./pincdir/$${filename_strip};            \
+       $(UNIFDEF) $(SPINCFRAME_UNIFDEF)                        \
+               $< > ./pincdir/$${filename} ||                  \
+               $(DECOMMENT) ./pincdir/$${filename} r >         \
+               ./pincdir/$${filename_strip};                   \
+       if [ -s ./pincdir/$${filename_strip} ];                 \
        then (                                                  \
        then (                                                  \
-               install $(INSTALL_FLAGS) ./incdir/$${filename} $(dir $@);\
+               install $(INSTALL_FLAGS) ./pincdir/$${filename} $(dir $@);\
        );                                                      \
        else                                                    \
                echo Header file $< not exported;               \
        );                                                      \
        else                                                    \
                echo Header file $< not exported;               \
-       fi;                                                     \
-       $(RM) -rf /incdir;
+       fi;
 
 
-$(INSTALL_MD_GEN_LCL_FILES): $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR)/% : %
+INSTALL_KF_MD_LCL_FILES = $(addprefix $(SOURCE), $(INSTALL_KF_MD_LCL_LIST))
+INSTALL_KF_MD_LCL_GEN_FILES = $(addprefix $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MD_DIR)/, $(INSTALL_KF_MD_LCL_GEN_LIST))
+
+$(INSTALL_KF_MD_LCL_GEN_FILES): $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MD_DIR)/% : %
        @true echo Installing $< in $(dir $@);                  \
        @true echo Installing $< in $(dir $@);                  \
-       $(MKDIR) $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR);        \
+       [ -d $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MD_DIR) ] ||$(MKDIR) $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MD_DIR);      \
+       filename=`$(BASENAME) $<`;                              \
+       filename_strip=$(addsuffix .strip,$${filename});        \
        $(RM) $(RMFLAGS) $@;                                    \
        $(RM) $(RMFLAGS) $@;                                    \
-       install $(INSTALL_FLAGS) $< $(dir $@);
+       [ -d ./kpincdir ] || $(MKDIR) ./kpincdir;                       \
+       echo garbage > ./kpincdir/$${filename_strip};           \
+       $(UNIFDEF) $(KPINCFRAME_UNIFDEF)                        \
+               $< > ./kpincdir/$${filename} ||                 \
+               $(DECOMMENT) ./kpincdir/$${filename} r >                \
+               ./kpincdir/$${filename_strip};                  \
+       if [ -s ./kpincdir/$${filename_strip} ];                        \
+       then (                                                  \
+               install $(INSTALL_FLAGS) ./kpincdir/$${filename} $(dir $@);\
+       );                                                      \
+       else                                                    \
+               echo Header file $< not exported;               \
+       fi;
 
 setup_installhdrs_mi: 
        @echo "[ $(SOURCE) ] make setup_installhdrs_mi $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 
 setup_installhdrs_mi: 
        @echo "[ $(SOURCE) ] make setup_installhdrs_mi $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
-do_installhdrs_mi: $(INSTALL_MI_GEN_INC_FILES) $(INSTALL_MI_GEN_LCL_FILES)
-       @echo "[ $(SOURCE) ] make do_installhdrs_mi $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
-       @if [ -n "$(strip $(INSTALL_MI_LIST))" ]; then                  \
+do_installhdrs_mi: $(INSTALL_MI_GEN_FILES) $(INSTALL_MI_GEN_LCL_FILES) $(INSTALL_KF_MI_GEN_FILES) $(INSTALL_KF_MI_LCL_GEN_FILES)
+       @true echo "[ $(SOURCE) ] make do_installhdrs_mi $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";    \
+       $(MKDIR) ./incmidir ./pincmidir ./kincmidir ./kpincmidir;                               \
+       if [ -n "$(strip $(INSTALL_MI_LIST))" ]; then                   \
            if [ -d $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR) ]; then      \
                (cd $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR);$(RM) $(RMFLAGS) $(INSTALL_MI_LIST) );       \
            else                                                                \
                $(MKDIR) $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR);        \
            fi;                                                         \
            if [ -d $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR) ]; then      \
                (cd $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR);$(RM) $(RMFLAGS) $(INSTALL_MI_LIST) );       \
            else                                                                \
                $(MKDIR) $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR);        \
            fi;                                                         \
-           $(MKDIR) ./incdir;                                          \
            for j in $(INSTALL_MI_LIST);                                \
            do                                                          \
            for j in $(INSTALL_MI_LIST);                                \
            do                                                          \
-               echo garbage > ./incdir/$$j.strip;                      \
-               $(UNIFDEF) -UKERNEL_PRIVATE -UDRIVER_PRIVATE            \
-                   $(SOURCE)/$$j > ./incdir/$$j ||                     \
-                   $(DECOMMENT) ./incdir/$$j r >                       \
-                   ./incdir/$$j.strip;                         \
-               if [ -s ./incdir/$$j.strip ];                           \
+               echo garbage > ./incmidir/$$j.strip;                    \
+               $(UNIFDEF) $(SINCFRAME_UNIFDEF)                         \
+                   $(SOURCE)/$$j > ./incmidir/$$j ||                   \
+                   $(DECOMMENT) ./incmidir/$$j r >                     \
+                   ./incmidir/$$j.strip;                               \
+               if [ -s ./incmidir/$$j.strip ];                         \
                then (                                                  \
                then (                                                  \
-                   install $(INSTALL_FLAGS) ./incdir/$$j $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR);       \
+                   install $(INSTALL_FLAGS) ./incmidir/$$j $(DSTROOT)/$(INCDIR)/$(INSTALL_MI_DIR);     \
                );                                                      \
                else                                                    \
                    echo Header file $$j not exported;          \
                fi;                                                     \
            done;                                                       \
                );                                                      \
                else                                                    \
                    echo Header file $$j not exported;          \
                fi;                                                     \
            done;                                                       \
-           $(RM) -rf ./incdir;                                         \
-       fi
-       @if [ -n "$(strip $(INSTALL_MI_LCL_LIST))" ]; then      \
+       fi;                                                             \
+       if [ -n "$(strip $(INSTALL_MI_LCL_LIST))" ]; then                       \
            if [ -d $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR) ]; then      \
                (cd $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR);$(RM) $(RMFLAGS) $(INSTALL_MI_LCL_LIST) );       \
            if [ -d $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR) ]; then      \
                (cd $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR);$(RM) $(RMFLAGS) $(INSTALL_MI_LCL_LIST) );       \
-           else                                                        \
+           else                                                                \
                $(MKDIR) $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR);        \
            fi;                                                         \
                $(MKDIR) $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR);        \
            fi;                                                         \
-           install $(INSTALL_FLAGS) $(INSTALL_MI_LCL_FILES) $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR);    \
-       fi
+           for j in $(INSTALL_MI_LCL_LIST);                            \
+           do                                                          \
+               echo garbage > ./pincmidir/$$j.strip;                   \
+               $(UNIFDEF) $(SPINCFRAME_UNIFDEF)                                \
+                   $(SOURCE)/$$j > ./pincmidir/$$j ||                  \
+                   $(DECOMMENT) ./pincmidir/$$j r >                    \
+                   ./pincmidir/$$j.strip;                              \
+               if [ -s ./pincmidir/$$j.strip ];                                \
+               then (                                                  \
+                   install $(INSTALL_FLAGS) ./pincmidir/$$j $(DSTROOT)/$(LCLDIR)/$(INSTALL_MI_DIR);    \
+               );                                                      \
+               else                                                    \
+                   echo Header file $$j not exported;          \
+               fi;                                                     \
+           done;                                                       \
+       fi;                                                             \
+       if [ -n "$(strip $(INSTALL_KF_MI_LIST))" ]; then                        \
+           if [ -d $(DSTROOT)/$(KINCDIR)/$(EXPORT_MI_DIR) ]; then      \
+               (cd $(DSTROOT)/$(KINCDIR)/$(EXPORT_MI_DIR);$(RM) $(RMFLAGS) $(INSTALL_KF_MI_LIST) );       \
+           else                                                                \
+               $(MKDIR) $(DSTROOT)/$(KINCDIR)/$(EXPORT_MI_DIR);        \
+           fi;                                                         \
+           for j in $(INSTALL_KF_MI_LIST);                             \
+           do                                                          \
+               echo garbage > ./kincmidir/$$j.strip;                   \
+               $(UNIFDEF) $(KINCFRAME_UNIFDEF)                         \
+                   $(SOURCE)/$$j > ./kincmidir/$$j ||                  \
+                   $(DECOMMENT) ./kincmidir/$$j r >                    \
+                   ./kincmidir/$$j.strip;                              \
+               if [ -s ./kincmidir/$$j.strip ];                                \
+               then (                                                  \
+                   install $(INSTALL_FLAGS) ./kincmidir/$$j $(DSTROOT)/$(KINCDIR)/$(EXPORT_MI_DIR);    \
+               );                                                      \
+               else                                                    \
+                   echo Header file $$j not exported;          \
+               fi;                                                     \
+           done;                                                       \
+       fi;                                                             \
+       if [ -n "$(strip $(INSTALL_KF_MI_LCL_LIST))" ]; then                    \
+           if [ -d $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MI_DIR) ]; then     \
+               (cd $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MI_DIR);$(RM) $(RMFLAGS) $(INSTALL_KF_MI_LCL_LIST) );       \
+           else                                                                \
+               $(MKDIR) $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MI_DIR);       \
+           fi;                                                         \
+           for j in $(INSTALL_KF_MI_LCL_LIST);                         \
+           do                                                          \
+               echo garbage > ./kpincmidir/$$j.strip;                  \
+               $(UNIFDEF) $(KPINCFRAME_UNIFDEF)                                \
+                   $(SOURCE)/$$j > ./kpincmidir/$$j ||                 \
+                   $(DECOMMENT) ./kpincmidir/$$j r >                   \
+                   ./kpincmidir/$$j.strip;                             \
+               if [ -s ./kpincmidir/$$j.strip ];                               \
+               then (                                                  \
+                   install $(INSTALL_FLAGS) ./kpincmidir/$$j $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MI_DIR);  \
+               );                                                      \
+               else                                                    \
+                   echo Header file $$j not exported;          \
+               fi;                                                     \
+           done;                                                       \
+       fi;                                                             \
+       $(RM) -rf ./incmidir ./pincmidir ./kincmidir ./kpincmidir;
 
 setup_installhdrs_md:
        @echo "[ $(SOURCE) ] make setup_installhdrs_md $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 
 setup_installhdrs_md:
        @echo "[ $(SOURCE) ] make setup_installhdrs_md $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
-do_installhdrs_md: $(INSTALL_MD_GEN_INC_FILES) $(INSTALL_MD_GEN_LCL_FILES)
-       @echo "[ $(SOURCE) ] make do_installhdrs_md $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
-       @if [ -n "$(strip $(INSTALL_MD_LIST))" ]; then                  \
+do_installhdrs_md: $(INSTALL_MD_GEN_INC_FILES) $(INSTALL_MD_GEN_LCL_FILES) $(INSTALL_KF_MD_GEN_FILES) $(INSTALL_KF_MD_LCL_GEN_FILES)
+       @true echo "[ $(SOURCE) ] make do_installhdrs_md $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";    \
+       $(MKDIR) ./incdir ./pincdir ./kincdir ./kpincdir;                               \
+       if [ -n "$(strip $(INSTALL_MD_LIST))" ]; then                   \
            if [ -d $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR) ]; then      \
                (cd $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR);$(RM) $(RMFLAGS) $(INSTALL_MD_LIST) );       \
            else                                                        \
                $(MKDIR) $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR);        \
            fi;                                                         \
            if [ -d $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR) ]; then      \
                (cd $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR);$(RM) $(RMFLAGS) $(INSTALL_MD_LIST) );       \
            else                                                        \
                $(MKDIR) $(DSTROOT)/$(INCDIR)/$(INSTALL_MD_DIR);        \
            fi;                                                         \
-           $(MKDIR) ./incdir;                                          \
            for j in $(INSTALL_MD_LIST);                                \
            do                                                          \
                echo garbage > ./incdir/$$j.strip;                      \
            for j in $(INSTALL_MD_LIST);                                \
            do                                                          \
                echo garbage > ./incdir/$$j.strip;                      \
-               $(UNIFDEF) -UKERNEL_PRIVATE -UDRIVER_PRIVATE            \
+               $(UNIFDEF) $(SINCFRAME_UNIFDEF)                         \
                    $(SOURCE)/$$j > ./incdir/$$j ||                     \
                    $(DECOMMENT) ./incdir/$$j r >                       \
                    ./incdir/$$j.strip;                         \
                    $(SOURCE)/$$j > ./incdir/$$j ||                     \
                    $(DECOMMENT) ./incdir/$$j r >                       \
                    ./incdir/$$j.strip;                         \
@@ -234,19 +351,75 @@ do_installhdrs_md: $(INSTALL_MD_GEN_INC_FILES) $(INSTALL_MD_GEN_LCL_FILES)
                    echo Header file $$j not exported;          \
                fi;                                                     \
            done;                                                       \
                    echo Header file $$j not exported;          \
                fi;                                                     \
            done;                                                       \
-           $(RM) -rf ./incdir;                                         \
-       fi
-       @if [ -n "$(strip $(INSTALL_MD_LCL_LIST))" ]; then              \
+       fi;                                                             \
+       if [ -n "$(strip $(INSTALL_MD_LCL_LIST))" ]; then                       \
            if [ -d $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR) ]; then      \
                (cd $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR);$(RM) $(RMFLAGS) $(INSTALL_MD_LCL_LIST) );       \
            else                                                        \
                $(MKDIR) $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR);        \
            fi;                                                         \
            if [ -d $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR) ]; then      \
                (cd $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR);$(RM) $(RMFLAGS) $(INSTALL_MD_LCL_LIST) );       \
            else                                                        \
                $(MKDIR) $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR);        \
            fi;                                                         \
-           install $(INSTALL_FLAGS) $(INSTALL_MD_LCL_FILES) $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR);    \
-       fi
-
+           for j in $(INSTALL_MD_LCL_LIST);                            \
+           do                                                          \
+               echo garbage > ./pincdir/$$j.strip;                     \
+               $(UNIFDEF) $(SPINCFRAME_UNIFDEF)                                \
+                   $(SOURCE)/$$j > ./pincdir/$$j ||                    \
+                   $(DECOMMENT) ./pincdir/$$j r >                      \
+                   ./pincdir/$$j.strip;                                \
+               if [ -s ./pincdir/$$j.strip ];                          \
+               then (                                                  \
+                   install $(INSTALL_FLAGS) ./pincdir/$$j $(DSTROOT)/$(LCLDIR)/$(INSTALL_MD_DIR);      \
+               );                                                      \
+               else                                                    \
+                   echo Header file $$j not exported;          \
+               fi;                                                     \
+           done;                                                       \
+       fi;                                                             \
+       if [ -n "$(strip $(INSTALL_KF_MD_LIST))" ]; then                        \
+           if [ -d $(DSTROOT)/$(KINCDIR)/$(EXPORT_MD_DIR) ]; then      \
+               (cd $(DSTROOT)/$(KINCDIR)/$(EXPORT_MD_DIR);$(RM) $(RMFLAGS) $(INSTALL_KF_MD_LIST) );       \
+           else                                                        \
+               $(MKDIR) $(DSTROOT)/$(KINCDIR)/$(EXPORT_MD_DIR);        \
+           fi;                                                         \
+           for j in $(INSTALL_KF_MD_LIST);                             \
+           do                                                          \
+               echo garbage > ./kincdir/$$j.strip;                     \
+               $(UNIFDEF) $(KINCFRAME_UNIFDEF)                         \
+                   $(SOURCE)/$$j > ./kincdir/$$j ||                    \
+                   $(DECOMMENT) ./kincdir/$$j r >                      \
+                   ./kincdir/$$j.strip;                                \
+               if [ -s ./kincdir/$$j.strip ];                          \
+               then (                                                  \
+                   install $(INSTALL_FLAGS) ./kincdir/$$j $(DSTROOT)/$(KINCDIR)/$(EXPORT_MD_DIR);      \
+               );                                                      \
+               else                                                    \
+                   echo Header file $$j not exported;          \
+               fi;                                                     \
+           done;                                                       \
+       fi;                                                             \
+       if [ -n "$(strip $(INSTALL_KF_MD_LCL_LIST))" ]; then                    \
+           if [ -d $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MD_DIR) ]; then     \
+               (cd $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MD_DIR);$(RM) $(RMFLAGS) $(INSTALL_KF_MD_LCL_LIST) );       \
+           else                                                        \
+               $(MKDIR) $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MD_DIR);       \
+           fi;                                                         \
+           for j in $(INSTALL_KF_MD_LCL_LIST);                         \
+           do                                                          \
+               echo garbage > ./kpincdir/$$j.strip;                    \
+               $(UNIFDEF) $(KPINCFRAME_UNIFDEF)                                \
+                   $(SOURCE)/$$j > ./kpincdir/$$j ||                   \
+                   $(DECOMMENT) ./kpincdir/$$j r >                     \
+                   ./kpincdir/$$j.strip;                               \
+               if [ -s ./kpincdir/$$j.strip ];                         \
+               then (                                                  \
+                   install $(INSTALL_FLAGS) ./kpincdir/$$j $(DSTROOT)/$(KPINCDIR)/$(EXPORT_MD_DIR);    \
+               );                                                      \
+               else                                                    \
+                   echo Header file $$j not exported;          \
+               fi;                                                     \
+           done;                                                       \
+       fi;                                                             \
+       $(RM) -rf ./incdir ./pincdir ./kincdir ./kpincdir;
 
 
-endif
 
 #
 # Generic Export rules
 
 #
 # Generic Export rules
@@ -258,7 +431,7 @@ EXPORT_MI_GEN_INC_FILES = $(addprefix $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR)/, $(
 
 $(EXPORT_MI_INC_FILES) $(EXPORT_MI_GEN_INC_FILES): $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR)/% : %
        @true echo Exporting $< in $(dir $@);                   \
 
 $(EXPORT_MI_INC_FILES) $(EXPORT_MI_GEN_INC_FILES): $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR)/% : %
        @true echo Exporting $< in $(dir $@);                   \
-       $(MKDIR) $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR); \
+       [ -d $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR) ] ||$(MKDIR) $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR);  \
        ${CP} -p $< $(dir $@);  \
 
 
        ${CP} -p $< $(dir $@);  \
 
 
@@ -267,20 +440,20 @@ EXPORT_MD_GEN_INC_FILES = $(addprefix $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR)/, $(
 
 $(EXPORT_MD_INC_FILES) $(EXPORT_MD_GEN_INC_FILES): $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR)/% : %
        @true echo Exporting $< in $(dir $@);                   \
 
 $(EXPORT_MD_INC_FILES) $(EXPORT_MD_GEN_INC_FILES): $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR)/% : %
        @true echo Exporting $< in $(dir $@);                   \
-       $(MKDIR) $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR); \
+       [ -d $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR) ] ||$(MKDIR) $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR);  \
        ${CP} -p $< $(dir $@);  \
 
 setup_exporthdrs_mi:
        @echo "[ $(SOURCE) ] make setup_exporthdrs_mi $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 do_exporthdrs_mi: $(EXPORT_MI_INC_FILES) $(EXPORT_MI_GEN_INC_FILES)
        ${CP} -p $< $(dir $@);  \
 
 setup_exporthdrs_mi:
        @echo "[ $(SOURCE) ] make setup_exporthdrs_mi $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 do_exporthdrs_mi: $(EXPORT_MI_INC_FILES) $(EXPORT_MI_GEN_INC_FILES)
-       @echo "[ $(SOURCE) ] make do_exporthdrs_mi $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
+       @true echo "[ $(SOURCE) ] make do_exporthdrs_mi $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 setup_exporthdrs_md:
        @echo "[ $(SOURCE) ] make setup_exporthdrs_md $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 do_exporthdrs_md: $(EXPORT_MD_INC_FILES) $(EXPORT_MD_GEN_INC_FILES)
 
 setup_exporthdrs_md:
        @echo "[ $(SOURCE) ] make setup_exporthdrs_md $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 do_exporthdrs_md: $(EXPORT_MD_INC_FILES) $(EXPORT_MD_GEN_INC_FILES)
-       @echo "[ $(SOURCE) ] make do_exporthdrs_md $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
+       @true echo "[ $(SOURCE) ] make do_exporthdrs_md $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 else
 
 
 else
 
@@ -289,7 +462,7 @@ EXPORT_MI_GEN_INC_FILES = $(addprefix $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR)/, $(
 
 $(EXPORT_MI_GEN_INC_FILES): $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR)/% : %
        @true echo Exporting $< in $(dir $@);                   \
 
 $(EXPORT_MI_GEN_INC_FILES): $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR)/% : %
        @true echo Exporting $< in $(dir $@);                   \
-       $(MKDIR) $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR); \
+       [ -d $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR) ] ||$(MKDIR) $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR);  \
        ${CP} -p $< $(dir $@);  \
 
 
        ${CP} -p $< $(dir $@);  \
 
 
@@ -298,14 +471,14 @@ EXPORT_MD_GEN_INC_FILES = $(addprefix $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR)/, $(
 
 $(EXPORT_MD_GEN_INC_FILES): $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR)/% : %
        @true echo Exporting $< in $(dir $@);                   \
 
 $(EXPORT_MD_GEN_INC_FILES): $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR)/% : %
        @true echo Exporting $< in $(dir $@);                   \
-       $(MKDIR) $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR); \
+       [ -d $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR) ] ||$(MKDIR) $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR);  \
        ${CP} -p $< $(dir $@);  \
 
 setup_exporthdrs_mi:
        @echo "[ $(SOURCE) ] make setup_exporthdrs_mi $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 do_exporthdrs_mi: $(EXPORT_MI_GEN_INC_FILES)
        ${CP} -p $< $(dir $@);  \
 
 setup_exporthdrs_mi:
        @echo "[ $(SOURCE) ] make setup_exporthdrs_mi $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 do_exporthdrs_mi: $(EXPORT_MI_GEN_INC_FILES)
-       @echo "[ $(SOURCE) ] make do_exporthdrs_mi $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
+       @true echo "[ $(SOURCE) ] make do_exporthdrs_mi $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
        @if [ -n "$(strip $(EXPORT_MI_LIST))" ]; then                                   \
                if [ -d $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR) ]; then                   \
                        (cd $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR);$(RM) $(RMFLAGS) $(EXPORT_MI_LIST) );       \
        @if [ -n "$(strip $(EXPORT_MI_LIST))" ]; then                                   \
                if [ -d $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR) ]; then                   \
                        (cd $(OBJROOT)/$(EXPDIR)/$(EXPORT_MI_DIR);$(RM) $(RMFLAGS) $(EXPORT_MI_LIST) );       \
@@ -319,7 +492,7 @@ setup_exporthdrs_md:
        @echo "[ $(SOURCE) ] make setup_exporthdrs_md $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 do_exporthdrs_md: $(EXPORT_MD_GEN_INC_FILES)
        @echo "[ $(SOURCE) ] make setup_exporthdrs_md $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 do_exporthdrs_md: $(EXPORT_MD_GEN_INC_FILES)
-       @echo "[ $(SOURCE) ] make do_exporthdrs_md $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
+       @true echo "[ $(SOURCE) ] make do_exporthdrs_md $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
        @if [ -n "$(strip $(EXPORT_MD_LIST))" ]; then                                   \
                if [ -d $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR) ]; then                   \
                        (cd $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR);$(RM) $(RMFLAGS) $(EXPORT_MD_LIST) );       \
        @if [ -n "$(strip $(EXPORT_MD_LIST))" ]; then                                   \
                if [ -d $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR) ]; then                   \
                        (cd $(OBJROOT)/$(EXPDIR)/$(EXPORT_MD_DIR);$(RM) $(RMFLAGS) $(EXPORT_MD_LIST) );       \
@@ -344,7 +517,7 @@ COMP_SOBJ_FILES = $(addprefix $(TARGET)$(COMP_OBJ_DIR), $(COMP_SOBJ_LIST))
 $(COMP_SOBJ_FILES): $(TARGET)$(COMP_OBJ_DIR)%.o : %.s
        ${S_KCC} -E -MD ${SFLAGS} -DASSEMBLER $(INCFLAGS) $< > $(patsubst %.o, %.pp, ${@});
        sed '/^\#/d' $(patsubst %.o, %.pp, ${@}) > $(patsubst %.o, %.s, ${@});
 $(COMP_SOBJ_FILES): $(TARGET)$(COMP_OBJ_DIR)%.o : %.s
        ${S_KCC} -E -MD ${SFLAGS} -DASSEMBLER $(INCFLAGS) $< > $(patsubst %.o, %.pp, ${@});
        sed '/^\#/d' $(patsubst %.o, %.pp, ${@}) > $(patsubst %.o, %.s, ${@});
-       ${S_KCC} ${SFLAGS} -m${ARCH_CONFIG_LC} ${_HOST_AS_FLAGS}  -c $(patsubst %.o, %.s, ${@});
+       ${S_KCC} ${SFLAGS} ${_HOST_AS_FLAGS}  -c $(patsubst %.o, %.s, ${@});
        ${RM} ${_RMFLAGS_} $(patsubst %.o, %.pp, ${@}) $(patsubst %.o,%.s,${@});
 
 S_RULE_1A=@ls /
        ${RM} ${_RMFLAGS_} $(patsubst %.o, %.pp, ${@}) $(patsubst %.o,%.s,${@});
 
 S_RULE_1A=@ls /
@@ -352,7 +525,7 @@ S_RULE_1B= ${patsubst %.o,%.s,${@}} > /dev/null
 S_RULE_2= ${S_KCC} -E -MD ${SFLAGS} -DASSEMBLER $(INCFLAGS) $< \
                > $(patsubst %.o, %.pp, ${@}); \
        sed '/^\#/d' $(patsubst %.o, %.pp, ${@}) > $(patsubst %.o, %.s, ${@});
 S_RULE_2= ${S_KCC} -E -MD ${SFLAGS} -DASSEMBLER $(INCFLAGS) $< \
                > $(patsubst %.o, %.pp, ${@}); \
        sed '/^\#/d' $(patsubst %.o, %.pp, ${@}) > $(patsubst %.o, %.s, ${@});
-S_RULE_3= ${S_KCC} ${SFLAGS} -m${ARCH_CONFIG_LC} ${_HOST_AS_FLAGS}  -c $(patsubst %.o, %.s, ${@});\
+S_RULE_3= ${S_KCC} ${SFLAGS} ${_HOST_AS_FLAGS}  -c $(patsubst %.o, %.s, ${@});\
        ${RM} ${_RMFLAGS_} $(patsubst %.o, %.pp, ${@}) $(patsubst %.o,%.s,${@})
 
 #
        ${RM} ${_RMFLAGS_} $(patsubst %.o, %.pp, ${@}) $(patsubst %.o,%.s,${@})
 
 #
@@ -361,12 +534,12 @@ S_RULE_3= ${S_KCC} ${SFLAGS} -m${ARCH_CONFIG_LC} ${_HOST_AS_FLAGS}  -c $(patsubs
 COMP_COBJ_FILES = $(addprefix $(TARGET)$(COMP_OBJ_DIR), $(COMP_COBJ_LIST))
 
 $(COMP_COBJ_FILES): $(TARGET)$(COMP_OBJ_DIR)%.o : %.c
 COMP_COBJ_FILES = $(addprefix $(TARGET)$(COMP_OBJ_DIR), $(COMP_COBJ_LIST))
 
 $(COMP_COBJ_FILES): $(TARGET)$(COMP_OBJ_DIR)%.o : %.c
-       ${KCC} -c ${CFLAGS} -MD ${${join $@,_CFLAGS}} ${INCFLAGS} ${${join $@,_INCFLAGS}} $<
+       ${KCC} -c ${filter-out ${${join $@,_CFLAGS_RM}}, ${CFLAGS}} -MD ${${join $@,_CFLAGS_ADD}} ${INCFLAGS} ${${join $@,_INCFLAGS}} $<
 
 #
 # Compilation rules to generate .o from .c for normal files
 #
 
 #
 # Compilation rules to generate .o from .c for normal files
 #
-C_RULE_1A=${KCC} -c ${CFLAGS} -MD ${${join $@,_CFLAGS}} ${INCFLAGS} ${${join $@,_INCFLAGS}} 
+C_RULE_1A=${KCC} -c ${filter-out ${${join $@,_CFLAGS_RM}}, ${CFLAGS} ${CWARNFLAGS}} -MD ${${join $@,_CFLAGS_ADD}} ${INCFLAGS} ${${join $@,_INCFLAGS}} 
 C_RULE_1B=$*.c
 C_RULE_2=
 C_RULE_3=
 C_RULE_1B=$*.c
 C_RULE_2=
 C_RULE_3=
@@ -384,7 +557,7 @@ C_RULE_4_D=${C_RULE_4}
 #
 # Compilation rules to generate .o from .m
 #
 #
 # Compilation rules to generate .o from .m
 #
-M_RULE_1A=${KCC} -c ${CFLAGS} -MD ${${join $@,_CFLAGS}} ${INCFLAGS} ${${join $@,_INCFLAGS}} 
+M_RULE_1A=${KCC} -c ${filter-out ${${join $@,_CFLAGS_RM}}, ${CFLAGS} ${MWARNFLAGS}} -MD ${${join $@,_CFLAGS_ADD}} ${INCFLAGS} ${${join $@,_INCFLAGS}} 
 M_RULE_1B=$*.m
 M_RULE_2=
 M_RULE_3=
 M_RULE_1B=$*.m
 M_RULE_2=
 M_RULE_3=
@@ -395,9 +568,9 @@ M_RULE_4=
 #   The config tool slickly changes the last source filename char to 'o'
 #   for the object filename.
 #
 #   The config tool slickly changes the last source filename char to 'o'
 #   for the object filename.
 #
-P_RULE_1A=${KCC} -o $@ -c ${CPPFLAGS} ${CFLAGS} -MD ${${join $@,_CFLAGS}} ${INCFLAGS} ${${join $@,_INCFLAGS}} 
+P_RULE_1A=${KC++} -o $@ -c ${CXXFLAGS} ${filter-out ${${join $@,_CFLAGS_RM}}, ${CFLAGS} ${CXXWARNFLAGS}} -MD ${${join $@,_CFLAGS_ADD}} ${INCFLAGS} ${${join $@,_INCFLAGS}} 
 P_RULE_1B=$(<F)
 P_RULE_1B=$(<F)
-P_RULE_2=@sed 's/.o: /.cpo: /' $(@:.cpo=.d) > $(@:.cpo=.d~) && mv $(@:.cpo=.d~) $(@:.cpo=.d)
+P_RULE_2=@sed 's/.c.o: /.cpo: /' $(@:.cpo=.d) > $(@:.cpo=.d~) && mv $(@:.cpo=.d~) $(@:.cpo=.d)
 P_RULE_3=
 P_RULE_4=
 
 P_RULE_3=
 P_RULE_4=
 
@@ -417,7 +590,7 @@ setup_build_all:
        @echo "[ $(SOURCE) ] make setup_build_all $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 do_build_all: $(COMP_FILES) $(COMP_COBJ_FILES) $(COMP_SOBJ_FILES) $(COMPONENT_IMAGE_FILE)
        @echo "[ $(SOURCE) ] make setup_build_all $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 do_build_all: $(COMP_FILES) $(COMP_COBJ_FILES) $(COMP_SOBJ_FILES) $(COMPONENT_IMAGE_FILE)
-       @echo "[ $(SOURCE) ] make do_build_all $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
+       @true echo "[ $(SOURCE) ] make do_build_all $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 ifeq ($(COMPONENT), .)
 do_build_all: do_build_mach_kernel
 
 ifeq ($(COMPONENT), .)
 do_build_all: do_build_mach_kernel
@@ -426,15 +599,17 @@ endif
 #
 # mach_kernel building rules
 #
 #
 # mach_kernel building rules
 #
-do_build_mach_kernel:
+do_build_mach_kernel: $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/kgmacros
        @echo "[ building mach_kernel ]";
        @echo "[ building mach_kernel ]";
-       $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/kernel_newvers       \
-           "`${CAT} $(SRCROOT)/osfmk/conf/kernelversion.major`"        \
-           "`${CAT} $(SRCROOT)/osfmk/conf/kernelversion.minor`"        \
-           "`${CAT} $(SRCROOT)/osfmk/conf/kernelversion.variant`";                             \
-       ${KCC} $(CFLAGS) $(INCLUDES) -c kernel_vers.c;                                          \
-       $(LD) $(LDFLAGS_KERNEL) $(addprefix $(TARGET)/,$(foreach component,$(COMPONENT_LIST), $(addprefix $(component)/$(firstword $($(addsuffix _KERNEL_CONFIG, $(component))) $(KERNEL_CONFIG))/, $(addsuffix .o, $(component))))) kernel_vers.o -o $(TARGET)/mach_kernel.sys $(LD_KERNEL_LIBS);      \
+       @install $(DATA_INSTALL_FLAGS) $(SRCROOT)/config/version.c $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/version.c;
+       @$(SRCROOT)/config/newvers.pl $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/version.c;
+       ${KCC} -c ${filter-out ${${join $@,_CFLAGS_RM}}, ${CFLAGS}} ${${join $@,_CFLAGS_ADD}} ${INCFLAGS} ${${join $@,_INCFLAGS}} $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/version.c -o $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/version.o
+       $(LD) $(LDFLAGS_KERNEL) $(addprefix $(TARGET)/,$(foreach component,$(COMPONENT_LIST), $(addprefix $(component)/$(firstword $($(addsuffix _KERNEL_CONFIG, $(shell echo -n $(component) | tr a-z A-Z))) $(KERNEL_CONFIG))/, $(addsuffix .o, $(component))))) $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/version.o -o $(TARGET)/mach_kernel.sys $(LD_KERNEL_LIBS); \
        $(STRIP) $(STRIP_FLAGS) $(TARGET)/mach_kernel.sys -o $(TARGET)/mach_kernel;
        $(STRIP) $(STRIP_FLAGS) $(TARGET)/mach_kernel.sys -o $(TARGET)/mach_kernel;
+
+$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/kgmacros: $(SRCROOT)/kgmacros
+       cp $? $@
+
 #
 # Generic Install rules
 #
 #
 # Generic Install rules
 #
@@ -444,17 +619,19 @@ force_file_install:
 
 $(INSTALL_FILE_FILES): $(DSTROOT)$(INSTALL_FILE_DIR)% : $(TARGET)/% force_file_install
        @echo Installing $< in $@;
 
 $(INSTALL_FILE_FILES): $(DSTROOT)$(INSTALL_FILE_DIR)% : $(TARGET)/% force_file_install
        @echo Installing $< in $@;
-       @$(MKDIR) $(DSTROOT)$(INSTALL_FILE_DIR);                        \
+       @if [ ! -e $(DSTROOT)$(INSTALL_FILE_DIR) ]; then        \
+               $(MKDIR) $(DSTROOT)$(INSTALL_FILE_DIR);         \
+       fi;                                                     \
        if [ "`echo $(INSTALL_ARCHS_LC) | wc -w`" -eq 1 ]; then \
                $(RM) $(RMFLAGS) $@;                            \
        if [ "`echo $(INSTALL_ARCHS_LC) | wc -w`" -eq 1 ]; then \
                $(RM) $(RMFLAGS) $@;                            \
-               install $(INSTALL_FLAGS) $< $(dir $@);          \
+               install $(FILE_INSTALL_FLAGS) $< $(dir $@);             \
        else                                                    \
                if [ ! -e $@ ]; then                            \
        else                                                    \
                if [ ! -e $@ ]; then                            \
-                       echo >empty_file;                       \
-                       lipo_arg="$(subst _empty_file, empty_file,$(foreach lipo_arch,$(INSTALL_ARCHS_LC), $(addprefix -arch , $(addsuffix _empty_file, $(lipo_arch)))))"; \
+                       echo >empty_file_$(notdir $@);                  \
+                       lipo_arg="$(subst _empty_file, empty_file_$(notdir $@),$(foreach lipo_arch,$(INSTALL_ARCHS_LC), $(addprefix -arch , $(addsuffix _empty_file, $(lipo_arch)))))"; \
                        $(LIPO) $${lipo_arg} -create -output $@;        \
                        $(LIPO) $${lipo_arg} -create -output $@;        \
-                       $(RM) $(RMFLAGS) empty_file;                    \
-               fi;                                                                             \
+                       $(RM) $(RMFLAGS) empty_file_$(notdir $@);               \
+               fi;                                                     \
                $(LIPO) $@ -replace $(ARCH_CONFIG_LC)  $< -o $@;        \
        fi
 
                $(LIPO) $@ -replace $(ARCH_CONFIG_LC)  $< -o $@;        \
        fi
 
@@ -464,26 +641,73 @@ force_filesys_install:
 
 $(INSTALL_FILESYS_FILES): $(SYMROOT)$(INSTALL_FILE_DIR)% : $(TARGET)/%.sys force_filesys_install
        @echo Installing $< in $@;
 
 $(INSTALL_FILESYS_FILES): $(SYMROOT)$(INSTALL_FILE_DIR)% : $(TARGET)/%.sys force_filesys_install
        @echo Installing $< in $@;
-       @$(MKDIR) $(SYMROOT)$(INSTALL_FILE_DIR);                        \
+       @if [ ! -e $(SYMROOT)$(INSTALL_FILE_DIR) ]; then        \
+               $(MKDIR) $(SYMROOT)$(INSTALL_FILE_DIR);         \
+       fi;                                                     \
        if [ "`echo $(INSTALL_ARCHS_LC) | wc -w`" -eq 1 ]; then \
                $(RM) $(RMFLAGS) $@;                            \
                install $(INSTALL_FLAGS) $< $(dir $@);          \
        else                                                    \
                if [ ! -e $@ ]; then                            \
        if [ "`echo $(INSTALL_ARCHS_LC) | wc -w`" -eq 1 ]; then \
                $(RM) $(RMFLAGS) $@;                            \
                install $(INSTALL_FLAGS) $< $(dir $@);          \
        else                                                    \
                if [ ! -e $@ ]; then                            \
-                       echo >empty_file;                       \
-                       lipo_arg="$(subst _empty_file, empty_file,$(foreach lipo_arch,$(INSTALL_ARCHS_LC), $(addprefix -arch , $(addsuffix _empty_file, $(lipo_arch)))))"; \
+                       echo >empty_filesys_$(notdir $@);                       \
+                       lipo_arg="$(subst _empty_file, empty_filesys_$(notdir $@),$(foreach lipo_arch,$(INSTALL_ARCHS_LC), $(addprefix -arch , $(addsuffix _empty_file, $(lipo_arch)))))"; \
                        $(LIPO) $${lipo_arg} -create -output $@;        \
                        $(LIPO) $${lipo_arg} -create -output $@;        \
-                       $(RM) $(RMFLAGS) empty_file;                    \
-               fi;                                                                             \
+                       $(RM) $(RMFLAGS) empty_filesys_$(notdir $@);            \
+               fi;                                                     \
                $(LIPO) $@ -replace $(ARCH_CONFIG_LC)  $< -o $@;        \
        fi
                $(LIPO) $@ -replace $(ARCH_CONFIG_LC)  $< -o $@;        \
        fi
+       cp $(SOURCE)kgmacros $(SYMROOT)$(INSTALL_FILE_DIR)
+
+INSTALL_DATA_FILES = $(addprefix $(DSTROOT)$(INSTALL_DATA_DIR), $(INSTALL_DATA_LIST))
+
+$(INSTALL_DATA_FILES): $(DSTROOT)$(INSTALL_DATA_DIR)% : $(SOURCE)/%
+       @echo Installing $< in $@;
+       @[ -d $(dir $@) ] ||$(MKDIR) $(dir $@);         \
+       $(RM) $(RMFLAGS) $@;            \
+       install $(DATA_INSTALL_FLAGS) $< $(dir $@);
 
 setup_build_install:
        @echo "[ $(SOURCE) ] make setup_build_install $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 
 setup_build_install:
        @echo "[ $(SOURCE) ] make setup_build_install $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
-do_build_install: $(INSTALL_FILESYS_FILES) $(INSTALL_FILE_FILES)
+do_build_install: $(INSTALL_FILESYS_FILES) $(INSTALL_FILE_FILES) $(INSTALL_DATA_FILES)
        @echo "[ $(SOURCE) ] make do_build_install $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
        @echo "[ $(SOURCE) ] make do_build_install $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
+INSTALL_MAN_FILES = $(addprefix $(DSTROOT)/$(MANDIR)/$(INSTALL_MAN_DIR)/, $(INSTALL_MAN_LIST))
+
+do_installman: $(INSTALL_MAN_FILES)
+       @echo "[ $(SOURCE) ] make do_installman"
+       @if [ -n "$(strip $(INSTALL_MAN_LIST))" ]; then \
+               man_dir=$(DSTROOT)/$(MANDIR)/$(INSTALL_MAN_DIR); \
+               if [ -d $$man_dir ]; then       \
+                       cur_dir=`pwd`;  \
+                       cd $$man_dir;   \
+                       $(RM) $(RMFLAGS) $(INSTALL_MAN_LIST) $(INSTALL_MAN_LINKS); \
+                       cd $$cur_dir;   \
+               else                    \
+                       $(MKDIR) $$man_dir;     \
+               fi;                             \
+               echo Installing $(INSTALL_MAN_LIST) in $$man_dir;       \
+               install $(INSTALL_FLAGS) $(INSTALL_MAN_LIST) $$man_dir; \
+               if [ -n "$(strip $(INSTALL_MAN_LINKS))" ]; then \
+                       set `echo ${INSTALL_MAN_LINKS}`; \
+                       while : ; do \
+                               case $$# in \
+                                       0) break;; \
+                                       1) echo "warn: empty INSTALL_MAN_LINKS: $$1"; break;; \
+                               esac; \
+                               link_src=$$1; shift; link_dst=$$1; shift; \
+                               echo "hard linking $${link_src} to $${link_dst}"; \
+                               ln -f $${man_dir}/$${link_src} $${man_dir}/$${link_dst} ; \
+                       done; \
+               fi; \
+       fi
+
+$(INSTALL_MAN_FILES): $(DSTROOT)/$(MANDIR)/$(INSTALL_MAN_DIR)/% : %
+       @true echo Installing $< in $(dir $@);                  \
+       $(MKDIR) $(DSTROOT)/$(MANDIR)/$(INSTALL_MAN_DIR);       \
+       $(RM) $(RMFLAGS) $@;                                    \
+       install $(INSTALL_FLAGS) $< $(dir $@);
+
 ifeq    ($(INCL_MAKEDEP), TRUE)
 -include Makedep
 endif
 ifeq    ($(INCL_MAKEDEP), TRUE)
 -include Makedep
 endif
mirror of XNU