X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/1c79356b52d46aa6b508fb032f5ae709b1f2897b..060df5ea7c632b1ac8cc8aac1fb59758165c2084:/osfmk/conf/Makefile

diff --git a/osfmk/conf/Makefile b/osfmk/conf/Makefile
index c7a6db857..4010dbcba 100644
--- a/osfmk/conf/Makefile
+++ b/osfmk/conf/Makefile
@@ -3,7 +3,6 @@ export MakeInc_def=${SRCROOT}/makedefs/MakeInc.def
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
 export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 
-
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 
@@ -18,51 +17,51 @@ ifndef OSFMK_KERNEL_CONFIG
 export OSFMK_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)/$(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) \
-	$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf
-	@echo "Running doconf for $(OSFMK_KERNEL_CONFIG)";
-	(doconf_target=$(addsuffix /conf, $(TARGET)); \
-	echo $${doconf_target};\
+	$(SOURCE)/files.$(ARCH_CONFIG_LC) \
+	$(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) -d  $(TARGET)/$(OSFMK_KERNEL_CONFIG) $(OSFMK_KERNEL_CONFIG); \
+	$(COMPOBJROOT)/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
-	(cd $(COMPOBJROOT)/$(OSFMK_KERNEL_CONFIG);			\
+	$(_v)(cd $(COMPOBJROOT)/$(OSFMK_KERNEL_CONFIG);			\
 	${RM} $@;						\
 	${LN} cputypes.h $@;					\
 	)
 
-do_setup_conf: $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf \
+do_setup_conf: $(COMPOBJROOT)/doconf \
 		$(COMPOBJROOT)/$(OSFMK_KERNEL_CONFIG)/Makefile \
 		$(COMPOBJROOT)/$(OSFMK_KERNEL_CONFIG)/platforms.h 
 
 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	\
+	$(_v)next_source=$(subst conf/,,$(SOURCE));			\
+	${MAKE} -C $(COMPOBJROOT)/$(OSFMK_KERNEL_CONFIG)	\
+		MAKEFILES=$(TARGET)/$(OSFMK_KERNEL_CONFIG)/Makefile	\
 		SOURCE=$${next_source}			\
 		TARGET=$(TARGET)					\
-		build_all	\
-	);		\
-	echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(OSFMK_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
+		INCL_MAKEDEP=FALSE	\
+		KERNEL_CONFIG=$(OSFMK_KERNEL_CONFIG)	\
+		build_all;
 
 do_build_all: do_all 
 
 include $(MakeInc_rule)
 include $(MakeInc_dir)
-