xnu-1504.15.3.tar.gz

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

diff --git a/libsa/conf/Makefile b/libsa/conf/Makefile
index 85e1a341a48f52f2f0b5f7a5857710179435bfb1..f2daf76186a949104f882c18d365aceb713c4d91 100644 (file)
--- a/libsa/conf/Makefile
+++ b/libsa/conf/Makefile
@@ -14,48 +14,48 @@ COMP_SUBDIRS =
 
 INST_SUBDIRS = 
 
-ifndef LIBKERN_KERNEL_CONFIG
-export LIBKERN_KERNEL_CONFIG = $(KERNEL_CONFIG)
+ifndef LIBSA_KERNEL_CONFIG
+export LIBSA_KERNEL_CONFIG = $(KERNEL_CONFIG)
 endif
 
-COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
+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)/$(LIBKERN_KERNEL_CONFIG)/Makefile :  $(SOURCE)/MASTER  \
+$(COMPOBJROOT)/$(LIBSA_KERNEL_CONFIG)/Makefile :  $(SOURCE)/MASTER  \
        $(SOURCE)/MASTER.$(ARCH_CONFIG_LC) \
        $(SOURCE)/Makefile.template  \
        $(SOURCE)/Makefile.$(ARCH_CONFIG_LC)  \
        $(SOURCE)/files \
        $(SOURCE)/files.$(ARCH_CONFIG_LC) \
-       $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf
-       @echo "Running doconf for $(LIBKERN_KERNEL_CONFIG)";
-       (doconf_target=$(addsuffix /conf, $(TARGET)); \
-       echo $${doconf_target};\
+       $(COMPOBJROOT)/doconf
+       $(_v)(doconf_target=$(addsuffix /conf, $(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)/$(LIBKERN_KERNEL_CONFIG) $(LIBKERN_KERNEL_CONFIG); \
+       $(COMPOBJROOT)/doconf -c -cpu $(ARCH_CONFIG_LC) -d  $(TARGET)/$(LIBSA_KERNEL_CONFIG) $(LIBSA_KERNEL_CONFIG); \
        );
 
-.ORDER: $(COMPOBJROOT)/$(LIBKERN_KERNEL_CONFIG)/Makefile
+.ORDER: $(COMPOBJROOT)/$(LIBSA_KERNEL_CONFIG)/Makefile
 
-do_setup_conf: $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf \
-               $(COMPOBJROOT)/$(LIBKERN_KERNEL_CONFIG)/Makefile
+do_setup_conf: $(COMPOBJROOT)/doconf \
+               $(COMPOBJROOT)/$(LIBSA_KERNEL_CONFIG)/Makefile
 
 do_all: do_setup_conf
-       @echo "[ $(SOURCE) ] Starting do_all  $(COMPONENT) $(LIBKERN_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";  \
-       (cd $(COMPOBJROOT)/$(LIBKERN_KERNEL_CONFIG);                            \
-       next_source=$(subst conf/,,$(SOURCE));                  \
-       ${MAKE} MAKEFILES=$(TARGET)/$(LIBKERN_KERNEL_CONFIG)/Makefile   \
+       $(_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      \
-               build_all       \
-       );              \
-       echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(LIBKERN_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
+               KERNEL_CONFIG=$(LIBSA_KERNEL_CONFIG)    \
+               build_all;
 
 do_build_all: do_all