X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..39236c6e673c41db228275375ab7fdb0f837b292:/libkern/conf/Makefile

diff --git a/libkern/conf/Makefile b/libkern/conf/Makefile
index f499460ea..25a42ef5e 100644
--- a/libkern/conf/Makefile
+++ b/libkern/conf/Makefile
@@ -3,62 +3,37 @@ 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 LIBKERN_KERNEL_CONFIG
-export LIBKERN_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
+MASTER_CPU_PER_SOC = $(SOURCE)/MASTER.$(CURRENT_ARCH_CONFIG_LC).$(CURRENT_MACHINE_CONFIG_LC)
 
-$(COMPOBJROOT)/doconf:
-	@make build_setup 
-
-$(COMPOBJROOT)/$(LIBKERN_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) \
-	$(COMPOBJROOT)/doconf
-	$(_v)(doconf_target=$(addsuffix /conf, $(TARGET)); \
-	echo $${doconf_target};\
-	$(MKDIR) $${doconf_target}; \
-	cd $${doconf_target}; \
+$(TARGET)/$(CURRENT_KERNEL_CONFIG)/Makefile :  $(SOURCE)/MASTER  \
+		$(SOURCE)/MASTER.$(CURRENT_ARCH_CONFIG_LC) \
+		$(SOURCE)/Makefile.template  \
+		$(SOURCE)/Makefile.$(CURRENT_ARCH_CONFIG_LC)  \
+		$(SOURCE)/files \
+		$(SOURCE)/files.$(CURRENT_ARCH_CONFIG_LC)
+	$(_v)$(MKDIR) $(addsuffix /conf, $(TARGET)); \
+	cd $(addsuffix /conf, $(TARGET)); \
 	rm -f $(notdir $?); \
-	cp  $? $${doconf_target}; \
-	$(COMPOBJROOT)/doconf -c -cpu $(ARCH_CONFIG_LC) -d  $(TARGET)/$(LIBKERN_KERNEL_CONFIG) $(LIBKERN_KERNEL_CONFIG); \
-	);
-
-.ORDER: $(COMPOBJROOT)/$(LIBKERN_KERNEL_CONFIG)/Makefile
-
-do_setup_conf: $(COMPOBJROOT)/doconf \
-		$(COMPOBJROOT)/$(LIBKERN_KERNEL_CONFIG)/Makefile
-
-do_all: do_setup_conf
-	$(_v)next_source=$(subst conf/,,$(SOURCE));			\
-	${MAKE} -C $(COMPOBJROOT)/$(LIBKERN_KERNEL_CONFIG)	\
-		MAKEFILES=$(TARGET)/$(LIBKERN_KERNEL_CONFIG)/Makefile	\
-		SOURCE=$${next_source}			\
-		TARGET=$(TARGET)					\
-		INCL_MAKEDEP=FALSE	\
-		KERNEL_CONFIG=$(LIBKERN_KERNEL_CONFIG)	\
+	cp  $? .; \
+	if [ $(MASTER_CPU_PER_SOC) -nt $@ ]; then cp $(MASTER_CPU_PER_SOC) .; fi; \
+	$(SRCROOT)/SETUP/config/doconf -c -cpu $(CURRENT_ARCH_CONFIG_LC) -soc $(CURRENT_MACHINE_CONFIG_LC) -d  $(TARGET)/$(CURRENT_KERNEL_CONFIG) $(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)