X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..316670eb35587141e969394ae8537d66b9211e80:/iokit/conf/Makefile.template

diff --git a/iokit/conf/Makefile.template b/iokit/conf/Makefile.template
index c1c09f5b5..96fe217a1 100644
--- a/iokit/conf/Makefile.template
+++ b/iokit/conf/Makefile.template
@@ -24,18 +24,15 @@ include $(MakeInc_cmd)
 include $(MakeInc_def)
 
 #
-# XXX: CFLAGS   ARM_TODO: added __MBUF_TRANSITION_ for IONetworkingFamily
+# XXX: CFLAGS
 #
-CFLAGS+= -imacros meta_features.h -DKERNEL -DDRIVER_PRIVATE				\
-	-Wall -Wno-four-char-constants -fno-common		\
+CFLAGS+= -include meta_features.h -DDRIVER_PRIVATE		\
 	-DIOMATCHDEBUG=1 -DIOALLOCDEBUG=1			\
-	-D__MBUF_TRANSITION_					\
-	-imacros meta_features.h $(CFLAGS_INLINE_CONFIG)
+	-include meta_features.h $(CFLAGS_INLINE_CONFIG)
 #-DIOKITDEBUG=-1
 
-CWARNFLAGS   += -Wno-unused-parameter -Wno-redundant-decls -Wno-nested-externs -Wno-write-strings
-MWARNFLAGS   += -Wno-unused-parameter -Wno-redundant-decls -Wno-nested-externs -Wno-write-strings
-CXXWARNFLAGS += -Wno-unused-parameter -Wno-redundant-decls -Wno-write-strings -Wno-cast-qual -Wno-shadow
+CWARNFLAGS   = $(CWARNFLAGS_STD) -Wno-unused-parameter
+CXXWARNFLAGS = $(CXXWARNFLAGS_STD) -Wno-unused-parameter -Wno-cast-qual -Wno-shadow
 
 CFLAGS_RELEASE += -DIOASSERT=0
 CFLAGS_DEBUG += -DIOASSERT=1
@@ -86,19 +83,24 @@ ${OBJS}: ${OBJSDEPS}
 
 LDOBJS = $(OBJS)
 
-$(COMPONENT).o: $(LDOBJS)
-	@echo LD $(COMPONENT)
-	$(_v)$(SEG_HACK) __HIB IOHibernateRestoreKernel.o -o _IOHibernateRestoreKernel.o
-	$(_v)mv _IOHibernateRestoreKernel.o IOHibernateRestoreKernel.o
-	$(_v)$(SEG_HACK) __HIB WKdmDecompress.o -o _WKdmDecompress.o
-	$(_v)mv _WKdmDecompress.o WKdmDecompress.o
-	$(_v)$(LD)  $(LDFLAGS_COMPONENT) -o $(COMPONENT).o ${LDOBJS} 
+$(COMPONENT).filelist: $(LDOBJS)
+	$(_v)if [ $(BUILD_MACHO_OBJ) -eq 1 ]; then \
+	for hib_file in ${HIB_FILES};		\
+	do	\
+                $(SEG_HACK) __HIB $${hib_file} -o $${hib_file}__; \
+                mv $${hib_file}__ $${hib_file} ; \
+	done; \
+	fi
+	@echo LDFILELIST $(COMPONENT)
+	$(_v)( for obj in ${LDOBJS}; do	\
+		 echo $(TARGET)$(COMP_OBJ_DIR)/$(KERNEL_CONFIG)/$${obj}; \
+	done; ) > $(COMPONENT).filelist
 
 do_depend: do_all
 	$(_v)${MD} -u Makedep -f -d `ls *.d`
 	
 	
-do_all: $(COMPONENT).o
+do_all: $(COMPONENT).filelist
 
 do_build_all: do_depend