xnu-2422.1.72.tar.gz

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

diff --git a/libkern/conf/Makefile b/libkern/conf/Makefile
index c744dea55c8b2cb890945bed12ed66707c6ee8f9..25a42ef5e9e27b9e0b26755455c3c814a6825594 100644 (file)
--- a/libkern/conf/Makefile
+++ b/libkern/conf/Makefile
@@ -3,61 +3,37 @@ 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 = \
-       tools
-
-COMP_SUBDIRS = 
-
-INST_SUBDIRS = 
-
-ifndef LIBKERN_KERNEL_CONFIG
-export LIBKERN_KERNEL_CONFIG = $(KERNEL_CONFIG)
-endif
-
-COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
-
-$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf:
-       make build_setup 
+MASTER_CPU_PER_SOC = $(SOURCE)/MASTER.$(CURRENT_ARCH_CONFIG_LC).$(CURRENT_MACHINE_CONFIG_LC)

 
 

-$(COMPOBJROOT)/$(LIBKERN_KERNEL_CONFIG)/Makefile :  $(SOURCE)/MASTER  \
-       $(SOURCE)/MASTER.$(arch_config) \
-       $(SOURCE)/Makefile.template  \
-       $(SOURCE)/Makefile.$(arch_config)  \
-       $(SOURCE)/files \
-       $(SOURCE)/files.$(arch_config) \
-       $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf
-       @echo "Running doconf for $(LIBKERN_KERNEL_CONFIG)";
-       (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 $?); \
        rm -f $(notdir $?); \

-       cp  $? $${doconf_target}; \
-       $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf -c -cpu $(arch_config) -d  $(TARGET)/$(LIBKERN_KERNEL_CONFIG) $(LIBKERN_KERNEL_CONFIG); \
-       );
-
-.ORDER: $(COMPOBJROOT)/$(LIBKERN_KERNEL_CONFIG)/Makefile
-
-do_setup_conf: $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf \
-               $(COMPOBJROOT)/$(LIBKERN_KERNEL_CONFIG)/Makefile
-
-do_all: do_setup_conf
-       @echo "[ $(SOURCE) ] Starting do_all  $(COMPONENT) $(LIBKERN_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";  \
-       (cd $(COMPOBJROOT)/$(LIBKERN_KERNEL_CONFIG);                            \
-       next_source=$(subst conf/,,$(SOURCE));                  \
-       ${MAKE} MAKEFILES=$(TARGET)/$(LIBKERN_KERNEL_CONFIG)/Makefile   \
-               SOURCE=$${next_source}                  \
-               TARGET=$(TARGET)                                        \
-               build_all       \
-       );              \
-       echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(LIBKERN_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
-
-do_build_all: do_all 
+       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 

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

-