xnu-1699.22.73.tar.gz

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

diff --git a/osfmk/conf/Makefile.template b/osfmk/conf/Makefile.template
index 7b918321e4b84c7fd37c7fe548e01c18eb292fb1..c39e844cfc25985a6fdf9706a84fbe1a24cb9c75 100644 (file)
--- a/osfmk/conf/Makefile.template
+++ b/osfmk/conf/Makefile.template
@@ -26,7 +26,7 @@ include $(MakeInc_def)
 #
 # XXX: CFLAGS
 #
-CFLAGS+= -DMACH_KERNEL_PRIVATE
+CFLAGS+= -include meta_features.h -DMACH_KERNEL_PRIVATE $(CFLAGS_INLINE_CONFIG)
 
 #
 # Directories for mig generated files
@@ -36,26 +36,23 @@ COMP_SUBDIRS = \
        device \
        mach_debug \
        mach \
-       UserNotification
+       UserNotification \
+       gssd \
+       kextd \
+       lockd
 
 COMP_SUBDIRS_I386 = \
        mach
 
+COMP_SUBDIRS_X86_64 = \
+       mach
+
 #
 #  Make sure we don't remove this by accident if interrupted at the wrong
 #  time.
 #
 .PRECIOUS: Makefile
 
-VERSION_FILES= \
-       $(SOURCE_DIR)/$(COMPONENT)/conf/version.major  \
-       $(SOURCE_DIR)/$(COMPONENT)/conf/version.minor   \
-       $(SOURCE_DIR)/$(COMPONENT)/conf/version.variant
-
-COPYRIGHT_FILES = \
-       $(SOURCE_DIR)/$(COMPONENT)/conf/copyright.osf \
-       $(SOURCE_DIR)/$(COMPONENT)/conf/copyright.cmu
-
 #
 #  Theses macros are filled in by the config program depending on the
 #  current configuration.  The MACHDEP macro is replaced by the
@@ -89,19 +86,23 @@ ${OBJS}: ${OBJSDEPS}
 
 LDOBJS = $(OBJS)
 
-$(COMPONENT).o: $(LDOBJS) assym.s
-       @echo "[ creating $(COMPONENT).o ]"
-       $(RM) $(RMFLAGS) vers.c
-       $(COMPOBJROOT)/newvers \
-       `$(CAT) ${VERSION_FILES}` ${COPYRIGHT_FILES}
-       ${KCC} $(CFLAGS) $(INCLUDES) -c vers.c
-       @echo [ updating $(COMPONENT).o ${OSFMK_KERNEL_CONFIG} ]
-       $(LD)  $(LDFLAGS_COMPONENT)  -o $(COMPONENT).o ${LDOBJS} vers.o 
-
-do_all: $(COMPONENT).o
+$(COMPONENT).filelist: $(LDOBJS) assym.s
+       $(_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; \
+       fi
+       @echo LDFILELIST $(COMPONENT)
+       $(_v)( for obj in ${LDOBJS}; do \
+                echo $(TARGET)$(COMP_OBJ_DIR)/$(KERNEL_CONFIG)/$${obj}; \
+       done; ) > $(COMPONENT).filelist
+
+do_all: $(COMPONENT).filelist
 
 do_depend: do_all
-       ${MD} -u Makedep -f -d `ls *.d`;
+       $(_v)${MD} -u Makedep -f -d `ls *.d`;
        
 do_build_all: do_depend
 
@@ -109,11 +110,17 @@ do_build_all: do_depend
 # we name it genassym.o to help with the automatic
 # dependency generation
 
-genassym.o: $(SOURCE_DIR)/$(COMPONENT)/$(ARCH_CONFIG_LC)/genassym.c
-       ${KCC} ${CFLAGS} -MD ${_HOST_EXTRA_CFLAGS} -S -o ${@} -c ${INCFLAGS} $<
+GENASSYM_LOCATION = $(ARCH_CONFIG_LC)
+
+ifeq ($(ARCH_CONFIG_LC),x86_64)
+GENASSYM_LOCATION = i386
+endif
+
+genassym.o: $(SOURCE_DIR)/$(COMPONENT)/$(GENASSYM_LOCATION)/genassym.c
+       $(_v)${KCC} $(subst -flto,,${CFLAGS}) -MD ${_HOST_EXTRA_CFLAGS} -S -o ${@} -c ${INCFLAGS} $<
 
 assym.s: genassym.o
-       sed -e '/#DEFINITION#/!d' -e 's/^.*#DEFINITION#//' -e 's/\$$//' genassym.o > ${@}
+       $(_v)sed -e '/#DEFINITION#/!d' -e 's/^.*#DEFINITION#//' -e 's/\$$//' -e 'p' -e 's/#//2' -e 's/[^A-Za-z0-9_]*\([A-Za-z0-9_]*\)/ \1_NUM/2' genassym.o > ${@}
 
 ${SOBJS}: assym.s
 
@@ -122,4 +129,3 @@ ${SOBJS}: assym.s
 
 include $(MakeInc_rule)
 include $(MakeInc_dir)
-