X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6d2010ae8f7a6078e10b361c6962983bab233e0f..3903760236c30e3b5ace7a4eefac3a269d68957c:/bsd/conf/Makefile

diff --git a/bsd/conf/Makefile b/bsd/conf/Makefile
index afaf3eb89..7bd79d9ae 100644
--- a/bsd/conf/Makefile
+++ b/bsd/conf/Makefile
@@ -6,50 +6,38 @@ export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 
-SETUP_SUBDIRS = 
-
-COMP_SUBDIRS = 
-
-INST_SUBDIRS = 
-
-ifndef BSD_KERNEL_CONFIG
-export BSD_KERNEL_CONFIG = $(KERNEL_CONFIG)
+# Special handling for x86_64h which shares a MASTER config file with x86_64:
+ifeq ($(CURRENT_ARCH_CONFIG_LC),x86_64h)
+DOCONF_ARCH_CONFIG_LC = x86_64
+else
+DOCONF_ARCH_CONFIG_LC = $(CURRENT_ARCH_CONFIG_LC)
 endif
 
-ifneq ($(MACHINE_CONFIG), DEFAULT)
-export COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)_$(MACHINE_CONFIG)/$(COMPONENT)
-else
-export COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
+MASTERCONFDIR = $(SRCROOT)/config
+DOCONFDEPS = $(addprefix $(MASTERCONFDIR)/, MASTER MASTER.$(DOCONF_ARCH_CONFIG_LC)) \
+	$(addprefix $(SOURCE)/, Makefile.template Makefile.$(DOCONF_ARCH_CONFIG_LC) files files.$(DOCONF_ARCH_CONFIG_LC))
+
+ifneq (,$(wildcard $(MASTERCONFDIR)/MASTER.$(DOCONF_ARCH_CONFIG_LC).$(CURRENT_MACHINE_CONFIG_LC)))
+DOCONFDEPS += $(MASTERCONFDIR)/MASTER.$(DOCONF_ARCH_CONFIG_LC).$(CURRENT_MACHINE_CONFIG_LC)
 endif
 
-MASTER_CPU_PER_SOC = $(SOURCE)/MASTER.$(ARCH_CONFIG_LC).$(MACHINE_CONFIG_LC)
-
-$(COMPOBJROOT)/$(BSD_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)
-	$(_v)(doconf_target=$(addsuffix /conf, $(TARGET)); \
-	$(MKDIR) $${doconf_target}; \
-	cd $${doconf_target}; \
-	rm -f $(notdir $?); \
-	cp  $? $${doconf_target}; \
-	if [ -f $(MASTER_CPU_PER_SOC) ]; then cp $(MASTER_CPU_PER_SOC) $${doconf_target}; fi; \
-	$(SRCROOT)/SETUP/config/doconf -c -cpu $(ARCH_CONFIG_LC) -soc $(MACHINE_CONFIG_LC) -d  $(TARGET)/$(BSD_KERNEL_CONFIG) $(BSD_KERNEL_CONFIG); \
-	);
-
-do_all: $(COMPOBJROOT)/$(BSD_KERNEL_CONFIG)/Makefile
-	$(_v)next_source=$(subst conf/,,$(SOURCE));			\
-	${MAKE} -C $(COMPOBJROOT)/$(BSD_KERNEL_CONFIG)	\
-		MAKEFILES=$(TARGET)/$(BSD_KERNEL_CONFIG)/Makefile	\
-		SOURCE=$${next_source}			\
-		TARGET=$(TARGET)					\
-		INCL_MAKEDEP=FALSE	\
-		KERNEL_CONFIG=$(BSD_KERNEL_CONFIG)	\
+$(TARGET)/$(CURRENT_KERNEL_CONFIG)/Makefile: $(SRCROOT)/SETUP/config/doconf $(OBJROOT)/SETUP/config $(DOCONFDEPS)
+	$(_v)$(MKDIR) $(TARGET)/$(CURRENT_KERNEL_CONFIG)
+	$(_v)$(SRCROOT)/SETUP/config/doconf -c -cpu $(DOCONF_ARCH_CONFIG_LC) -soc $(CURRENT_MACHINE_CONFIG_LC) -d $(TARGET)/$(CURRENT_KERNEL_CONFIG) -s $(SOURCE) -m $(MASTERCONFDIR) $(CURRENT_KERNEL_CONFIG);
+
+do_all: $(TARGET)/$(CURRENT_KERNEL_CONFIG)/Makefile
+	$(_v)${MAKE} \
+		-C $(TARGET)/$(CURRENT_KERNEL_CONFIG)			\
+		-f $(TARGET)/$(CURRENT_KERNEL_CONFIG)/Makefile		\
+		CURRENT_KERNEL_CONFIG=${CURRENT_KERNEL_CONFIG}		\
+		CURRENT_ARCH_CONFIG=${CURRENT_ARCH_CONFIG}		\
+		CURRENT_MACHINE_CONFIG=${CURRENT_MACHINE_CONFIG}	\
+		SOURCE=$(subst conf/,,$(SOURCE))			\
+		TARGET=${TARGET}					\
+		OBJPATH=${OBJPATH}					\
 		build_all;
 
-do_build_all: do_all 
+do_build_all:: do_all
 
 include $(MakeInc_rule)
 include $(MakeInc_dir)