xnu-792.6.56.tar.gz

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

diff --git a/bsd/conf/Makefile b/bsd/conf/Makefile
index 5a0b12a678cbb239692abce620d8769fe951eef3..b4b5a7d2f09f3e47b52242d8e00d86bb32af75b5 100644 (file)
--- a/bsd/conf/Makefile
+++ b/bsd/conf/Makefile
@@ -3,6 +3,10 @@ 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
 

+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)
 
 include $(MakeInc_cmd)
 include $(MakeInc_def)


@@ -18,17 +22,17 @@ ifndef BSD_KERNEL_CONFIG
 export BSD_KERNEL_CONFIG = $(KERNEL_CONFIG)
 endif
 
 export BSD_KERNEL_CONFIG = $(KERNEL_CONFIG)
 endif
 

-COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
+export COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)

 
 $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf:
        make build_setup 
 
 $(COMPOBJROOT)/$(BSD_KERNEL_CONFIG)/Makefile :  $(SOURCE)/MASTER  \
 
 $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf:
        make build_setup 
 
 $(COMPOBJROOT)/$(BSD_KERNEL_CONFIG)/Makefile :  $(SOURCE)/MASTER  \

-       $(SOURCE)/MASTER.$(arch_config) \
+       $(SOURCE)/MASTER.$(ARCH_CONFIG_LC) \

        $(SOURCE)/Makefile.template  \
        $(SOURCE)/Makefile.template  \

-       $(SOURCE)/Makefile.$(arch_config)  \
+       $(SOURCE)/Makefile.$(ARCH_CONFIG_LC)  \

        $(SOURCE)/files \
        $(SOURCE)/files \

-       $(SOURCE)/files.$(arch_config) \
+       $(SOURCE)/files.$(ARCH_CONFIG_LC) \

        $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf
        @echo "Running doconf for $(BSD_KERNEL_CONFIG)";
        (doconf_target=$(addsuffix /conf, $(TARGET)); \
        $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf
        @echo "Running doconf for $(BSD_KERNEL_CONFIG)";
        (doconf_target=$(addsuffix /conf, $(TARGET)); \


@@ -37,7 +41,7 @@ $(COMPOBJROOT)/$(BSD_KERNEL_CONFIG)/Makefile :  $(SOURCE)/MASTER  \
        cd $${doconf_target}; \
        rm -f $(notdir $?); \
        cp  $? $${doconf_target}; \
        cd $${doconf_target}; \
        rm -f $(notdir $?); \
        cp  $? $${doconf_target}; \

-       $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf -c -cpu $(arch_config) -d  $(TARGET)/$(BSD_KERNEL_CONFIG) $(BSD_KERNEL_CONFIG); \
+       $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf -c -cpu $(ARCH_CONFIG_LC) -d  $(TARGET)/$(BSD_KERNEL_CONFIG) $(BSD_KERNEL_CONFIG); \

        );
 
 .ORDER: $(COMPOBJROOT)/$(BSD_KERNEL_CONFIG)/Makefile 
        );
 
 .ORDER: $(COMPOBJROOT)/$(BSD_KERNEL_CONFIG)/Makefile 


@@ -47,13 +51,14 @@ do_setup_conf: $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf \
 
 do_all: do_setup_conf
        @echo "[ $(SOURCE) ] Starting do_all  $(COMPONENT) $(BSD_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";      \
 
 do_all: do_setup_conf
        @echo "[ $(SOURCE) ] Starting do_all  $(COMPONENT) $(BSD_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";      \

-       (cd $(COMPOBJROOT)/$(BSD_KERNEL_CONFIG);                                \

        next_source=$(subst conf/,,$(SOURCE));                  \
        next_source=$(subst conf/,,$(SOURCE));                  \

-       ${MAKE} MAKEFILES=$(TARGET)/$(BSD_KERNEL_CONFIG)/Makefile       \
+       ${MAKE} -C $(COMPOBJROOT)/$(BSD_KERNEL_CONFIG)  \
+               MAKEFILES=$(TARGET)/$(BSD_KERNEL_CONFIG)/Makefile       \

                SOURCE=$${next_source}                  \
                TARGET=$(TARGET)                                        \
                SOURCE=$${next_source}                  \
                TARGET=$(TARGET)                                        \

-               build_all       \
-       );              \
+               INCL_MAKEDEP=FALSE      \
+               KERNEL_CONFIG=$(BSD_KERNEL_CONFIG)      \
+               build_all;      \

        echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(BSD_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
 
 do_build_all: do_all 
        echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(BSD_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
 
 do_build_all: do_all