X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4a3eedf9ecc9bbe3f3a5c6ce5e53ad199d639d32..c3c9b80d004dbbfdf763edeb97968c6997e3b45b:/security/conf/Makefile.template

diff --git a/security/conf/Makefile.template b/security/conf/Makefile.template
index f697e624e..24a7728b6 100644
--- a/security/conf/Makefile.template
+++ b/security/conf/Makefile.template
@@ -5,16 +5,6 @@
 # the terms and conditions for use and redistribution.
 #
 
-#
-# Export IDENT for sub-makefiles
-#
-export IDENT
-
-#
-# INCFLAGS to include security prototypes
-#
-INCFLAGS_MAKEFILE= -I$(SOURCE) -I$(SOURCE)/..
-
 export MakeInc_cmd=${SRCROOT}/makedefs/MakeInc.cmd
 export MakeInc_def=${SRCROOT}/makedefs/MakeInc.def
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
@@ -26,28 +16,25 @@ include $(MakeInc_def)
 #
 # XXX: CFLAGS
 #
-CFLAGS+= -I. -imacros meta_features.h -DKERNEL -DBSD_KERNEL_PRIVATE \
-	-Wall -Wno-four-char-constants -fno-common
+CFLAGS+= -include meta_features.h -DBSD_KERNEL_PRIVATE
+SFLAGS+= -include meta_features.h
+
+#
+# INCFLAGS to include security prototypes
+#
+INCFLAGS_MAKEFILE= -I$(SOURCE)/..
 
 #
 # Directories for mig generated files
 #
 COMP_SUBDIRS =
 
-
+#
 #  Make sure we don't remove this by accident if interrupted at the wrong
 #  time.
 #
 .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.nai
-
 #
 #  Theses macros are filled in by the config program depending on the
 #  current configuration.  The MACHDEP macro is replaced by the
@@ -58,46 +45,66 @@ COPYRIGHT_FILES = \
 
 %OBJS
 
+%LIBOBJS
+
 %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)
+# Diagnostic opt-outs.  We need to make this list empty.
 #
-${OBJS}: ${OBJSDEPS}
-
-
-%LOAD
-
-LDOBJS = $(OBJS)
-
-$(COMPONENT).o: $(LDOBJS)
-	$(_v)$(RM) $(RMFLAGS) vers.c
-	$(_v)$(COMPOBJROOT)/newvers \
-	`$(CAT) ${VERSION_FILES}` ${COPYRIGHT_FILES}
-	$(_v)${KCC} $(CFLAGS) $(INCLUDES) -c vers.c
-	@echo LD $(COMPONENT)
-	$(_v)$(LD)  $(LDFLAGS_COMPONENT)  -o $(COMPONENT).o ${LDOBJS} vers.o 
-
-do_all: $(COMPONENT).o
-
-do_depend: do_all
-	$(_v)${MD} -u Makedep -f -d `ls *.d`;
-	
-do_build_all: do_depend
-
-${SOBJS}: 
-
+# DO NOT ADD MORE HERE.
+#
+# -Wno-cast-align
+mac_base.o_CFLAGS_ADD += -Wno-cast-align
+# -Wno-shorten-64-to-32
+mac_audit.o_CFLAGS_ADD += -Wno-shorten-64-to-32
+mac_base.o_CFLAGS_ADD += -Wno-shorten-64-to-32
+mac_process.o_CFLAGS_ADD += -Wno-shorten-64-to-32
+# -Wno-sign-conversion
+mac_base.o_CFLAGS_ADD += -Wno-sign-conversion
+mac_mach.o_CFLAGS_ADD += -Wno-sign-conversion
+mac_vfs.o_CFLAGS_ADD += -Wno-sign-conversion
+mac_vfs_subr.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
+
+$(COMPONENT).libfilelist: $(LIBOBJS)
+	@$(LOG_LDFILELIST) "lib$(COMPONENT)"
+	$(_v)for obj in ${LIBOBJS}; do	\
+		 $(ECHO) $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
+	done > $(COMPONENT).libfilelist
+
+ifeq ($(RC_ProjectName),xnu_libraries)
+do_all: $(COMPONENT).libfilelist
+else
+do_all: $(COMPONENT).filelist
+endif
+
+do_build_all:: do_all
 
 %RULES