xnu-4570.1.46.tar.gz

[apple/xnu.git] / security / conf / Makefile.template

diff --git a/security/conf/Makefile.template b/security/conf/Makefile.template
index 0270cfb709ea99df87e34beb3f5f895fd2464a7d..8330c0a5f0d43f18d20b6925e4f3d8011e3e78b3 100644 (file)
--- a/security/conf/Makefile.template
+++ b/security/conf/Makefile.template
@@ -17,6 +17,7 @@ include $(MakeInc_def)
 # XXX: CFLAGS
 #
 CFLAGS+= -include meta_features.h -DBSD_KERNEL_PRIVATE
+SFLAGS+= -include meta_features.h
 
 # Objects that don't want -Wcast-align warning (8474835)
 OBJS_NO_CAST_ALIGN =           \
@@ -33,7 +34,7 @@ INCFLAGS_MAKEFILE= -I$(SOURCE)/..
 #
 # Directories for mig generated files
 #
-COMP_SUBDIRS = 
+COMP_SUBDIRS =
 
 #
 #  Make sure we don't remove this by accident if interrupted at the wrong
@@ -41,14 +42,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.nai
-
 #
 #  Theses macros are filled in by the config program depending on the
 #  current configuration.  The MACHDEP macro is replaced by the
@@ -61,37 +54,36 @@ COPYRIGHT_FILES = \
 
 %CFILES
 
+%CXXFILES
+
 %SFILES
 
 %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}
-
-LDOBJS = $(OBJS)
-
-$(COMPONENT).filelist: $(LDOBJS) vers.o
-       @echo LDFILELIST $(COMPONENT)
-       $(_v)( for obj in ${LDOBJS} vers.o; do  \
+# 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)
+       @echo "$(ColorL)LDFILELIST$(Color0) $(ColorLF)$(COMPONENT)$(Color0)"
+       $(_v)for obj in ${OBJS}; do     \
                 echo $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
-       done; ) > $(COMPONENT).filelist
+       done > $(COMPONENT).filelist
 
 do_all: $(COMPONENT).filelist
 
 do_build_all:: do_all
 
-vers.o: vers.c
-       @echo CC $@
-       $(_v)${KCC} $(CFLAGS) -o ${@} -c ${INCFLAGS} $<
-
-vers.c:
-       $(_v)$(SRCROOT)/SETUP/newvers \
-               `$(CAT) ${VERSION_FILES}` ${COPYRIGHT_FILES}
-
 %RULES
 
 include $(MakeInc_rule)