X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0b4e3aa066abc0728aacb4bbeb86f53f9737156e..3903760236c30e3b5ace7a4eefac3a269d68957c:/pexpert/conf/Makefile

diff --git a/pexpert/conf/Makefile b/pexpert/conf/Makefile
index 4baa6f1cf..7bd79d9ae 100644
--- a/pexpert/conf/Makefile
+++ b/pexpert/conf/Makefile
@@ -3,62 +3,41 @@ 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)
 
-SETUP_SUBDIRS = \
-	tools
-
-COMP_SUBDIRS = 
-
-INST_SUBDIRS = 
-
-ifndef PEXPERT_KERNEL_CONFIG
-export PEXPERT_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
 
-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))
 
-$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf:
-	make build_setup 
-
-$(COMPOBJROOT)/$(PEXPERT_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 $(PEXPERT_KERNEL_CONFIG)";
-	(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)/$(PEXPERT_KERNEL_CONFIG) $(PEXPERT_KERNEL_CONFIG); \
-	);
-
-.ORDER: $(COMPOBJROOT)/$(PEXPERT_KERNEL_CONFIG)/Makefile 
+ifneq (,$(wildcard $(MASTERCONFDIR)/MASTER.$(DOCONF_ARCH_CONFIG_LC).$(CURRENT_MACHINE_CONFIG_LC)))
+DOCONFDEPS += $(MASTERCONFDIR)/MASTER.$(DOCONF_ARCH_CONFIG_LC).$(CURRENT_MACHINE_CONFIG_LC)
+endif
 
-do_setup_conf: $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf \
-		$(COMPOBJROOT)/$(PEXPERT_KERNEL_CONFIG)/Makefile 
+$(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: do_setup_conf
-	@echo "[ $(SOURCE) ] Starting do_all  $(COMPONENT) $(PEXPERT_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";	\
-	(cd $(COMPOBJROOT)/$(PEXPERT_KERNEL_CONFIG);				\
-	next_source=$(subst conf/,,$(SOURCE));			\
-	${MAKE} MAKEFILES=$(TARGET)/$(PEXPERT_KERNEL_CONFIG)/Makefile	\
-		SOURCE=$${next_source}			\
-		TARGET=$(TARGET)					\
-		INCL_MAKEDEP=FALSE	\
-		build_all	\
-	);		\
-	echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(PEXPERT_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
+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)
-