xnu-3248.40.184.tar.gz

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

diff --git a/pexpert/conf/Makefile b/pexpert/conf/Makefile
index 482f105be649582515356661d27a84bbb4dcf9a0..76db9a7d80c1c1809b1f2a81b267f014ca6389b5 100644 (file)
--- a/pexpert/conf/Makefile
+++ b/pexpert/conf/Makefile
@@ -3,56 +3,41 @@ export MakeInc_def=${SRCROOT}/makedefs/MakeInc.def
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
 export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
 export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 

-

 include $(MakeInc_cmd)
 include $(MakeInc_def)
 
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 

-SETUP_SUBDIRS =
-
-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
 
 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
 
 endif
 

-MASTER_CPU_PER_SOC = $(SOURCE)/MASTER.$(ARCH_CONFIG_LC).$(MACHINE_CONFIG_LC)
-
-$(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)
-       $(_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)/$(PEXPERT_KERNEL_CONFIG) $(PEXPERT_KERNEL_CONFIG); \
-       );
-
-do_all: $(COMPOBJROOT)/$(PEXPERT_KERNEL_CONFIG)/Makefile 
-       $(_v)next_source=$(subst conf/,,$(SOURCE));                     \
-       next_relsource=$(subst conf/,,$(RELATIVE_SOURCE_PATH));         \
-       ${MAKE} -C $(COMPOBJROOT)/$(PEXPERT_KERNEL_CONFIG)      \
-               MAKEFILES=$(TARGET)/$(PEXPERT_KERNEL_CONFIG)/Makefile   \
-               SOURCE=$${next_source}                  \
-               RELATIVE_SOURCE_PATH=$${next_relsource}                 \
-               TARGET=$(TARGET)                                        \
-               INCL_MAKEDEP=FALSE      \
-               KERNEL_CONFIG=$(PEXPERT_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;
 
                build_all;
 

-do_build_all: do_all 
+do_build_all:: do_all 

 
 include $(MakeInc_rule)
 include $(MakeInc_dir)
 
 include $(MakeInc_rule)
 include $(MakeInc_dir)