xnu-1228.tar.gz

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

diff --git a/libsa/conf/Makefile b/libsa/conf/Makefile
index fc29125a6e98f1765e100803162e607ede9758ab..c7a74f71e9268bc648a5b7a9902398889a0baedb 100644 (file)
--- a/libsa/conf/Makefile
+++ b/libsa/conf/Makefile
@@ -18,10 +18,14 @@ ifndef LIBSA_KERNEL_CONFIG
 export LIBSA_KERNEL_CONFIG = $(KERNEL_CONFIG)
 endif
 
+ifneq ($(MACHINE_CONFIG), DEFAULT)
+export COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)_$(MACHINE_CONFIG)/$(COMPONENT)
+else
 export COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
+endif
 
-$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf:
-       make build_setup 
+$(COMPOBJROOT)/doconf:
+       @make build_setup 
 
 $(COMPOBJROOT)/$(LIBSA_KERNEL_CONFIG)/Makefile :  $(SOURCE)/MASTER  \
        $(SOURCE)/MASTER.$(ARCH_CONFIG_LC) \
@@ -29,33 +33,30 @@ $(COMPOBJROOT)/$(LIBSA_KERNEL_CONFIG)/Makefile :  $(SOURCE)/MASTER  \
        $(SOURCE)/Makefile.$(ARCH_CONFIG_LC)  \
        $(SOURCE)/files \
        $(SOURCE)/files.$(ARCH_CONFIG_LC) \
-       $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf
-       @echo "Running doconf for $(LIBSA_KERNEL_CONFIG)";
-       (doconf_target=$(addsuffix /conf, $(TARGET)); \
+       $(COMPOBJROOT)/doconf
+       $(_v)(doconf_target=$(addsuffix /conf, $(TARGET)); \
        echo $${doconf_target};\
        $(MKDIR) $${doconf_target}; \
        cd $${doconf_target}; \
        rm -f $(notdir $?); \
        cp  $? $${doconf_target}; \
-       $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf -c -cpu $(ARCH_CONFIG_LC) -d  $(TARGET)/$(LIBSA_KERNEL_CONFIG) $(LIBSA_KERNEL_CONFIG); \
+       $(COMPOBJROOT)/doconf -c -cpu $(ARCH_CONFIG_LC) -d  $(TARGET)/$(LIBSA_KERNEL_CONFIG) $(LIBSA_KERNEL_CONFIG); \
        );
 
 .ORDER: $(COMPOBJROOT)/$(LIBSA_KERNEL_CONFIG)/Makefile
 
-do_setup_conf: $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf \
+do_setup_conf: $(COMPOBJROOT)/doconf \
                $(COMPOBJROOT)/$(LIBSA_KERNEL_CONFIG)/Makefile
 
 do_all: do_setup_conf
-       @echo "[ $(SOURCE) ] Starting do_all  $(COMPONENT) $(LIBSA_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";    \
-       next_source=$(subst conf/,,$(SOURCE));                  \
+       $(_v)next_source=$(subst conf/,,$(SOURCE));                     \
        ${MAKE} -C $(COMPOBJROOT)/$(LIBSA_KERNEL_CONFIG)        \
                MAKEFILES=$(TARGET)/$(LIBSA_KERNEL_CONFIG)/Makefile     \
                SOURCE=$${next_source}                  \
                TARGET=$(TARGET)                                        \
                INCL_MAKEDEP=FALSE      \
                KERNEL_CONFIG=$(LIBSA_KERNEL_CONFIG)    \
-               build_all;      \
-       echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(LIBSA_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
+               build_all;
 
 do_build_all: do_all