X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/bd504ef0e0b883cdd7917b73b3574eb9ce669905..39236c6e673c41db228275375ab7fdb0f837b292:/libkern/conf/Makefile.template

diff --git a/libkern/conf/Makefile.template b/libkern/conf/Makefile.template
index 7d1848535..a9b7a9af7 100644
--- a/libkern/conf/Makefile.template
+++ b/libkern/conf/Makefile.template
@@ -5,16 +5,6 @@
 # the terms and conditions for use and redistribution.
 #
 
-#
-# Export IDENT for sub-makefiles
-#
-export IDENT
-
-#
-# INCFLAGS 
-#
-INCFLAGS_MAKEFILE=  
-
 export MakeInc_cmd=${SRCROOT}/makedefs/MakeInc.cmd
 export MakeInc_def=${SRCROOT}/makedefs/MakeInc.def
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
@@ -26,8 +16,15 @@ include $(MakeInc_def)
 #
 # CFLAGS
 #
-CFLAGS+= -include meta_features.h -DLIBKERN_KERNEL_PRIVATE -DOSALLOCDEBUG=1 \
-         $(CFLAGS_INLINE_CONFIG)
+CFLAGS+= -include meta_features.h -DLIBKERN_KERNEL_PRIVATE -DOSALLOCDEBUG=1
+
+# Objects that don't want -Wcast-align warning (8474835)
+OSKextLib.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
+OSKext.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
+OSMetaClass.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
+OSUnserialize.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
+corecrypto_md5.o_CWARNFLAGS_ADD = -Wno-cast-align
+corecrypto_sha1.o_CWARNFLAGS_ADD = -Wno-cast-align
 
 # zlib is 3rd party source
 compress.o_CWARNFLAGS_ADD = -Wno-cast-qual 
@@ -67,15 +64,26 @@ COMP_SUBDIRS =
 
 %CFILES
 
-%MFILES
-
 %SFILES
 
-%BFILES
-
-%ORDERED
 %MACHDEP
 
+#
+# Machine-independent per-file flags
+#
+
+# zlib is 3rd party source
+compress.o_CWARNFLAGS_ADD = -Wno-cast-qual 
+deflate.o_CWARNFLAGS_ADD = -Wno-cast-qual 
+infback.o_CWARNFLAGS_ADD = -Wno-cast-qual 
+inffast.o_CWARNFLAGS_ADD = -Wno-cast-qual 
+inflate.o_CWARNFLAGS_ADD = -Wno-cast-qual 
+trees.o_CWARNFLAGS_ADD = -Wno-cast-qual 
+uncompr.o_CWARNFLAGS_ADD = -Wno-cast-qual 
+
+# warnings in bison-generated code
+OSUnserializeXML.cpo_CXXWARNFLAGS_ADD = -Wno-uninitialized
+
 #
 #  OBJSDEPS is the set of files (defined in the machine dependent
 #  template if necessary) which all objects depend on (such as an
@@ -83,30 +91,22 @@ COMP_SUBDIRS =
 #
 ${OBJS}: ${OBJSDEPS}
 
-
-%LOAD
-
 LDOBJS = $(OBJS)
 
 $(COMPONENT).filelist: $(LDOBJS)
-	$(_v)if [ $(BUILD_MACHO_OBJ) -eq 1 ]; then \
-	for hib_file in ${HIB_FILES}; \
+	$(_v)for hib_file in ${HIB_FILES}; \
 	do	\
-		$(SEG_HACK) __HIB $${hib_file} -o $${hib_file}__; \
+		$(SEG_HACK) -n __HIB -o $${hib_file}__ $${hib_file} ; \
 		mv $${hib_file}__ $${hib_file} ; \
-	done; \
-	fi
+	done
 	@echo LDFILELIST $(COMPONENT)
 	$(_v)( for obj in ${LDOBJS}; do	\
-		 echo $(TARGET)$(COMP_OBJ_DIR)/$(KERNEL_CONFIG)/$${obj}; \
+		 echo $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
 	done; ) > $(COMPONENT).filelist
 
 do_all: $(COMPONENT).filelist
 
-do_depend: do_all
-	$(_v)${MD} -u Makedep -f -d `ls *.d`
-	
-do_build_all: do_depend 
+do_build_all:: do_all
 
 %RULES