xnu-517.tar.gz

[apple/xnu.git] / osfmk / conf / Makefile

diff --git a/osfmk/conf/Makefile b/osfmk/conf/Makefile
index c7a6db8571f9d504815561477e86f5f57d8a0fde..131bd8c567df8abaed0c327f20a3e7c875206595 100644 (file)
--- a/osfmk/conf/Makefile
+++ b/osfmk/conf/Makefile
@@ -18,17 +18,17 @@ ifndef OSFMK_KERNEL_CONFIG
 export OSFMK_KERNEL_CONFIG = $(KERNEL_CONFIG)
 endif
 
-COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
+export COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
 
 $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf:
        make build_setup 
 
 $(COMPOBJROOT)/$(OSFMK_KERNEL_CONFIG)/Makefile:  $(SOURCE)/MASTER  \
-       $(SOURCE)/MASTER.$(arch_config) \
+       $(SOURCE)/MASTER.$(ARCH_CONFIG_LC) \
        $(SOURCE)/Makefile.template  \
-       $(SOURCE)/Makefile.$(arch_config)  \
+       $(SOURCE)/Makefile.$(ARCH_CONFIG_LC)  \
        $(SOURCE)/files \
-       $(SOURCE)/files.$(arch_config) \
+       $(SOURCE)/files.$(ARCH_CONFIG_LC) \
        $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf
        @echo "Running doconf for $(OSFMK_KERNEL_CONFIG)";
        (doconf_target=$(addsuffix /conf, $(TARGET)); \
@@ -37,7 +37,7 @@ $(COMPOBJROOT)/$(OSFMK_KERNEL_CONFIG)/Makefile:  $(SOURCE)/MASTER  \
        cd $${doconf_target}; \
        rm -f $(notdir $?); \
        cp  $? $${doconf_target}; \
-       $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf -c -cpu $(arch_config) -d  $(TARGET)/$(OSFMK_KERNEL_CONFIG) $(OSFMK_KERNEL_CONFIG); \
+       $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf -c -cpu $(ARCH_CONFIG_LC) -d  $(TARGET)/$(OSFMK_KERNEL_CONFIG) $(OSFMK_KERNEL_CONFIG); \
        );
 
 $(COMPOBJROOT)/$(OSFMK_KERNEL_CONFIG)/platforms.h: $(COMPOBJROOT)/$(OSFMK_KERNEL_CONFIG)/Makefile
@@ -52,13 +52,14 @@ do_setup_conf: $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf \
 
 do_all: do_setup_conf
        @echo "[ $(SOURCE) ] Starting do_all  $(COMPONENT) $(OSFMK_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";    \
-       (cd $(COMPOBJROOT)/$(OSFMK_KERNEL_CONFIG);                              \
        next_source=$(subst conf/,,$(SOURCE));                  \
-       ${MAKE} MAKEFILES=$(TARGET)/$(OSFMK_KERNEL_CONFIG)/Makefile     \
+       ${MAKE} -C $(COMPOBJROOT)/$(OSFMK_KERNEL_CONFIG)        \
+               MAKEFILES=$(TARGET)/$(OSFMK_KERNEL_CONFIG)/Makefile     \
                SOURCE=$${next_source}                  \
                TARGET=$(TARGET)                                        \
-               build_all       \
-       );              \
+               INCL_MAKEDEP=FALSE      \
+               KERNEL_CONFIG=$(OSFMK_KERNEL_CONFIG)    \
+               build_all;      \
        echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(OSFMK_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
 
 do_build_all: do_all