xnu-517.tar.gz

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

diff --git a/libsa/conf/Makefile.template b/libsa/conf/Makefile.template
index 816da3ef17dcfe9db403b854ef177741cf57b4ba..a8d3252d6f03f06a5a8617068832127b9e57036f 100644 (file)
--- a/libsa/conf/Makefile.template
+++ b/libsa/conf/Makefile.template
@@ -27,7 +27,7 @@ include $(MakeInc_def)
 #
 # XXX: CFLAGS
 #
 #
 # XXX: CFLAGS
 #

-CFLAGS+= -DKERNEL -DLIBKERN_KERNEL_PRIVATE \
+CFLAGS+= -DKERNEL -DLIBSA_KERNEL_PRIVATE \

          -Wall -Wno-four-char-constants -fno-common
 
 SFLAGS+= -DKERNEL
          -Wall -Wno-four-char-constants -fno-common
 
 SFLAGS+= -DKERNEL


@@ -87,10 +87,10 @@ LDOBJS = $(OBJS)
 $(COMPONENT).o: $(LDOBJS)
        @echo "creating $(COMPONENT).o"
        $(RM) $(RMFLAGS) vers.c
 $(COMPONENT).o: $(LDOBJS)
        @echo "creating $(COMPONENT).o"
        $(RM) $(RMFLAGS) vers.c

-       $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/newvers \
+       $(COMPOBJROOT)/newvers \

        `$(CAT) ${VERSION_FILES}` ${COPYRIGHT_FILES}
        ${KCC} $(CFLAGS) $(INCLUDES) -c vers.c
        `$(CAT) ${VERSION_FILES}` ${COPYRIGHT_FILES}
        ${KCC} $(CFLAGS) $(INCLUDES) -c vers.c

-       @echo [ updating $(COMPONENT).o ${LIBKERN_KERNEL_CONFIG} ]
+       @echo [ updating $(COMPONENT).o ${LIBSA_KERNEL_CONFIG} ]

        $(LD)  $(LDFLAGS_COMPONENT) -o $(COMPONENT).o ${LDOBJS} vers.o /usr/local/lib/libkld.a
        $(SEG_HACK) __KLD $(COMPONENT).o -o $(COMPONENT)_kld.o
        mv $(COMPONENT)_kld.o $(COMPONENT).o
        $(LD)  $(LDFLAGS_COMPONENT) -o $(COMPONENT).o ${LDOBJS} vers.o /usr/local/lib/libkld.a
        $(SEG_HACK) __KLD $(COMPONENT).o -o $(COMPONENT)_kld.o
        mv $(COMPONENT)_kld.o $(COMPONENT).o