X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d1ecb069dfe24481e4a83f44cb5217a2b06746d7..6d2010ae8f7a6078e10b361c6962983bab233e0f:/iokit/conf/Makefile.template

diff --git a/iokit/conf/Makefile.template b/iokit/conf/Makefile.template
index 55d99d413..96fe217a1 100644
--- a/iokit/conf/Makefile.template
+++ b/iokit/conf/Makefile.template
@@ -26,15 +26,13 @@ include $(MakeInc_def)
 #
 # XXX: CFLAGS
 #
-CFLAGS+= -imacros meta_features.h -DKERNEL -DDRIVER_PRIVATE				\
-	-Wall -fno-common					\
+CFLAGS+= -include meta_features.h -DDRIVER_PRIVATE		\
 	-DIOMATCHDEBUG=1 -DIOALLOCDEBUG=1			\
-	-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
@@ -85,22 +83,24 @@ ${OBJS}: ${OBJSDEPS}
 
 LDOBJS = $(OBJS)
 
-$(COMPONENT).o: $(LDOBJS)
-	$(_v)for hib_file in ${HIB_FILES};		\
+$(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;
+	done; \
+	fi
 	@echo LDFILELIST $(COMPONENT)
 	$(_v)( for obj in ${LDOBJS}; do	\
 		 echo $(TARGET)$(COMP_OBJ_DIR)/$(KERNEL_CONFIG)/$${obj}; \
-	done; ) > $(COMPONENT).o
+	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