xnu-1228.tar.gz

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

diff --git a/libsa/conf/Makefile.template b/libsa/conf/Makefile.template
index 0419939c741c8c69183fe04aced5ddfbae6e0ceb..9d966e91a914bd4399c47c119a69822e9b9ad14d 100644 (file)
--- a/libsa/conf/Makefile.template
+++ b/libsa/conf/Makefile.template
@@ -27,8 +27,8 @@ include $(MakeInc_def)
 #
 # XXX: CFLAGS
 #
-CFLAGS+= -DKERNEL -DLIBSA_KERNEL_PRIVATE \
-         -Wall -Wno-four-char-constants -fno-common
+CFLAGS+= -imacros meta_features.h -DKERNEL -DLIBSA_KERNEL_PRIVATE \
+         -Wall -Wno-four-char-constants -fno-common  $(CFLAGS_INLINE_CONFIG)
 
 SFLAGS+= -DKERNEL
 
@@ -77,16 +77,15 @@ ${OBJS}: ${OBJSDEPS}
 LDOBJS = $(OBJS)
 
 $(COMPONENT).o: $(LDOBJS)
-       @echo "creating $(COMPONENT).o"
-       @echo [ updating $(COMPONENT).o ${LIBSA_KERNEL_CONFIG} ]
-       $(LD)  $(LDFLAGS_COMPONENT) -o $(COMPONENT).o ${LDOBJS} /usr/local/lib/libkld.a
-       $(SEG_HACK) __KLD $(COMPONENT).o -o $(COMPONENT)_kld.o
-       mv $(COMPONENT)_kld.o $(COMPONENT).o
+       @echo LD $(COMPONENT)
+       $(_v)$(LD)  $(LDFLAGS_COMPONENT) -o $(COMPONENT).o ${LDOBJS} $(LIBKLD)
+       $(_v)$(SEG_HACK) __KLD $(COMPONENT).o -o $(COMPONENT)_kld.o
+       $(_v)$(LD) $(LDFLAGS_COMPONENT) $(COMPONENT)_kld.o -o $(COMPONENT).o
 
 do_all: $(COMPONENT).o
 
 do_depend: do_all
-       ${MD} -u Makedep -f -d `ls *.d`
+       $(_v)${MD} -u Makedep -f -d `ls *.d`
        
 do_build_all: do_depend