xnu-1699.22.73.tar.gz

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

diff --git a/iokit/conf/Makefile.template b/iokit/conf/Makefile.template
index 55d99d413b752cac6e67d6b3162f33163fbbc0b5..96fe217a1366d8a8252d66502678c4d049dc5386 100644 (file)
--- 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