X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/55e303ae13a4cf49d70f2294092726f2fffb9ef2..2a1bd2d3eef5c7a7bb14f4bb9fdbca9a96ee4752:/pexpert/conf/Makefile.template?ds=sidebyside

diff --git a/pexpert/conf/Makefile.template b/pexpert/conf/Makefile.template
index 8ef62f8b4..92b00f7ac 100644
--- a/pexpert/conf/Makefile.template
+++ b/pexpert/conf/Makefile.template
@@ -5,16 +5,6 @@
 # the terms and conditions for use and redistribution.
 #
 
-#
-# Export IDENT for sub-makefiles
-#
-export IDENT
-
-#
-# XXX: INCFLAGS 
-#
-INCFLAGS_MAKEFILE=  $(INCFLAGS_POSIX)
-
 export MakeInc_cmd=${SRCROOT}/makedefs/MakeInc.cmd
 export MakeInc_def=${SRCROOT}/makedefs/MakeInc.def
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
@@ -24,20 +14,15 @@ include $(MakeInc_cmd)
 include $(MakeInc_def)
 
 #
-# XXX: CFLAGS
-#
-# -D_KERNEL_BUILD -DKERNEL_BUILD -DARCH_PRIVATE -DBSD_BUILD -DMACH_KERNEL
+# CFLAGS
 #
-CFLAGS+= -DPEXPERT_KERNEL_PRIVATE -DKERNEL -DDRIVER_PRIVATE 	\
-	-Wall -Wno-four-char-constants -fno-common		\
-	-DRelease3CompatibilityBuild
-
-SFLAGS+= -DKERNEL
+CFLAGS+= -include meta_features.h -DPEXPERT_KERNEL_PRIVATE
+SFLAGS+= -include meta_features.h
 
 #
 # Directories for mig generated files
 #
-COMP_SUBDIRS = 
+COMP_SUBDIRS =
 
 #
 #  Make sure we don't remove this by accident if interrupted at the wrong
@@ -45,14 +30,6 @@ COMP_SUBDIRS =
 #
 .PRECIOUS: Makefile
 
-VERSION_FILES= \
-	$(SOURCE_DIR)/$(COMPONENT)/conf/version.major  \
-	$(SOURCE_DIR)/$(COMPONENT)/conf/version.minor   \
-	$(SOURCE_DIR)/$(COMPONENT)/conf/version.variant 
-
-COPYRIGHT_FILES = \
-	$(SOURCE_DIR)/$(COMPONENT)/conf/copyright
-
 #
 #  Theses macros are filled in by the config program depending on the
 #  current configuration.  The MACHDEP macro is replaced by the
@@ -65,45 +42,56 @@ COPYRIGHT_FILES = \
 
 %CFILES
 
-%MFILES
+%CXXFILES
 
 %SFILES
 
-%BFILES
-
-%ORDERED
 %MACHDEP
 
 #
-#  OBJSDEPS is the set of files (defined in the machine dependent
-#  template if necessary) which all objects depend on (such as an
-#  in-line assembler expansion filter)
-#
-${OBJS}: ${OBJSDEPS}
-
-
-%LOAD
-
-LDOBJS = $(OBJS)
-
-$(COMPONENT).o: $(LDOBJS)
-	@echo "creating $(COMPONENT).o"
-	$(RM) $(RMFLAGS) vers.c
-	$(COMPOBJROOT)/newvers \
-	`$(CAT) ${VERSION_FILES}` ${COPYRIGHT_FILES}
-	${KCC} $(CFLAGS) $(INCLUDES) -c vers.c
-	@echo [ updating $(COMPONENT).o ${PEXPERT_KERNEL_CONFIG} ]
-	$(LD) $(LDFLAGS_COMPONENT) -o $(COMPONENT).o ${LDOBJS} vers.o 
-
-do_depend: do_all
-	${MD} -u Makedep -f -d `ls *.d`;
-	
-do_all: $(COMPONENT).o
-
-do_build_all: do_depend
+# Diagnostic opt-outs.  We need to make this list empty.
+#
+# DO NOT ADD MORE HERE.
+#
+# -Wno-cast-align
+pe_identify_machine.o_CFLAGS_ADD += -Wno-cast-align
+# -Wno-implicit-int-conversion
+pe_serial.o_CFLAGS_ADD += -Wno-implicit-int-conversion
+# -Wno-shorten-64-to-32
+pe_identify_machine.o_CFLAGS_ADD += -Wno-shorten-64-to-32
+pe_init.o_CFLAGS_ADD += -Wno-shorten-64-to-32
+# -Wno-sign-conversion
+bootargs.o_CFLAGS_ADD += -Wno-sign-conversion
+device_tree.o_CFLAGS_ADD += -Wno-sign-conversion
+pe_identify_machine.o_CFLAGS_ADD += -Wno-sign-conversion
+pe_init.o_CFLAGS_ADD += -Wno-sign-conversion
+pe_serial.o_CFLAGS_ADD += -Wno-sign-conversion
+
+# Rebuild if per-file overrides change
+${OBJS}: $(firstword $(MAKEFILE_LIST))
+
+# Rebuild if global compile flags change
+$(COBJS): .CFLAGS
+.CFLAGS: ALWAYS
+	$(_v)$(REPLACECONTENTS) $@ $(KCC) $(CFLAGS) $(INCFLAGS)
+$(CXXOBJS): .CXXFLAGS
+.CXXFLAGS: ALWAYS
+	$(_v)$(REPLACECONTENTS) $@ $(KC++) $(CXXFLAGS) $(INCFLAGS)
+$(SOBJS): .SFLAGS
+.SFLAGS: ALWAYS
+	$(_v)$(REPLACECONTENTS) $@ $(S_KCC) $(SFLAGS) $(INCFLAGS)
+
+$(COMPONENT).filelist: $(OBJS)
+	@$(LOG_LDFILELIST) "$(COMPONENT)"
+	$(_v)for obj in ${OBJS}; do	\
+		 $(ECHO) $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
+	done > $(COMPONENT).filelist
+
+do_all: $(COMPONENT).filelist
+
+do_build_all:: do_all
 
 %RULES
 
 include $(MakeInc_rule)
 include $(MakeInc_dir)
-