xnu-2782.1.97.tar.gz

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

diff --git a/iokit/conf/Makefile.template b/iokit/conf/Makefile.template
index 4a72c656fb7117becbf76b73aa2851c8ac21b1cb..ceffec084943f0ff0653f4593899e334ac1f6513 100644 (file)
--- a/iokit/conf/Makefile.template
+++ b/iokit/conf/Makefile.template
@@ -64,27 +64,34 @@ COMP_SUBDIRS =
 
 %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)
+# 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)
        $(_v)for hib_file in ${HIB_FILES};              \
        do      \
                 $(SEG_HACK) -n __HIB -o $${hib_file}__ $${hib_file} ; \
                 mv $${hib_file}__ $${hib_file} ; \
        done
        @echo LDFILELIST $(COMPONENT)
-       $(_v)( for obj in ${LDOBJS}; do \
+       $(_v)( for obj in ${OBJS}; do   \
                 echo $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
        done; ) > $(COMPONENT).filelist