xnu-1699.22.73.tar.gz

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

diff --git a/libsa/conf/Makefile.template b/libsa/conf/Makefile.template
index a975da2a59bba6dd870e3d287c72eb69bea7e76b..26aede6b235e654d34c930dc1d9ebd323045b727 100644 (file)
--- a/libsa/conf/Makefile.template
+++ b/libsa/conf/Makefile.template
@@ -27,8 +27,8 @@ include $(MakeInc_def)
 #
 # CFLAGS
 #
-CFLAGS+= -imacros meta_features.h -DLIBSA_KERNEL_PRIVATE \
-         -Werror $(CFLAGS_INLINE_CONFIG)
+CFLAGS+= -include meta_features.h -DLIBSA_KERNEL_PRIVATE \
+         $(CFLAGS_INLINE_CONFIG)
 
 #
 # Directories for mig generated files
@@ -74,23 +74,26 @@ ${OBJS}: ${OBJSDEPS}
 
 LDOBJS = $(OBJS)
 
-$(COMPONENT).o: $(LDOBJS)
-       $(_v)for kld_file in ${LDOBJS}; do      \
+$(COMPONENT).filelist: $(LDOBJS)
+       $(_v)if [ $(BUILD_MACHO_OBJ) -eq 1 ]; then \
+       for kld_file in ${LDOBJS}; do      \
                $(SEG_HACK) __KLD $${kld_file} -o $${kld_file}__; \
                mv $${kld_file}__ $${kld_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_all: $(COMPONENT).o
+do_all: $(COMPONENT).filelist
 
 do_depend: do_all
        $(_v)${MD} -u Makedep -f -d `ls *.d`
        
 do_build_all: do_depend 
 
+
 %RULES
 
 include $(MakeInc_rule)