xnu-1699.22.73.tar.gz

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

diff --git a/bsd/conf/Makefile b/bsd/conf/Makefile
index b4b5a7d2f09f3e47b52242d8e00d86bb32af75b5..afaf3eb8973150f8a2fb813313c3cf02392344db 100644 (file)
--- a/bsd/conf/Makefile
+++ b/bsd/conf/Makefile
@@ -3,16 +3,10 @@ export MakeInc_def=${SRCROOT}/makedefs/MakeInc.def
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
 export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 
-export vnode_pager.o_CFLAGS_ADD=-Werror
-export vm_unix.o_CFLAGS_ADD=-Werror
-export dp_backing_file.o_CFLAGS_ADD=-Werror
-export if_mib.o_CFLAGS_ADD=-Wno-unused-parameter
-
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 
-SETUP_SUBDIRS = \
-       tools
+SETUP_SUBDIRS = 
 
 COMP_SUBDIRS = 
 
@@ -22,44 +16,38 @@ ifndef BSD_KERNEL_CONFIG
 export BSD_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
 
-$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf:
-       make build_setup 
+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) \
-       $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf
-       @echo "Running doconf for $(BSD_KERNEL_CONFIG)";
-       (doconf_target=$(addsuffix /conf, $(TARGET)); \
-       echo $${doconf_target};\
+       $(SOURCE)/files.$(ARCH_CONFIG_LC)
+       $(_v)(doconf_target=$(addsuffix /conf, $(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)/$(BSD_KERNEL_CONFIG) $(BSD_KERNEL_CONFIG); \
+       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); \
        );
 
-.ORDER: $(COMPOBJROOT)/$(BSD_KERNEL_CONFIG)/Makefile 
-
-do_setup_conf: $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf \
-               $(COMPOBJROOT)/$(BSD_KERNEL_CONFIG)/Makefile 
-
-do_all: do_setup_conf
-       @echo "[ $(SOURCE) ] Starting do_all  $(COMPONENT) $(BSD_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";      \
-       next_source=$(subst conf/,,$(SOURCE));                  \
+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)      \
-               build_all;      \
-       echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(BSD_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
+               build_all;
 
 do_build_all: do_all