xnu-2782.1.97.tar.gz

[apple/xnu.git] / iokit / IOKit / Makefile

diff --git a/iokit/IOKit/Makefile b/iokit/IOKit/Makefile
index f7f7c729b1a2888eb2ce676ae9c8c112e30c5d9a..5ea0528d5a85df6a65088b8d25e03d408288b4d2 100644 (file)
--- a/iokit/IOKit/Makefile
+++ b/iokit/IOKit/Makefile
@@ -3,51 +3,56 @@ export MakeInc_def=${SRCROOT}/makedefs/MakeInc.def
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
 export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
 export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 

-IOKIT_FRAMEDIR = $(FRAMEDIR)/IOKit.framework/Versions/A
-export INCDIR = $(IOKIT_FRAMEDIR)/Headers
-export LCLDIR = $(IOKIT_FRAMEDIR)/PrivateHeaders
+IOKIT_INCVERS = A
+IOKIT_INCFRAME = $(FRAMEDIR)/IOKit.framework
+IOKIT_INCDIR = $(IOKIT_INCFRAME)/Versions/$(IOKIT_INCVERS)/Headers
+IOKIT_PINCDIR = $(IOKIT_INCFRAME)/Versions/$(IOKIT_INCVERS)/PrivateHeaders
+
+INCDIR = $(IOKIT_INCDIR)
+LCLDIR = $(IOKIT_PINCDIR)

 
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 
 INSTINC_SUBDIRS = \
 
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 
 INSTINC_SUBDIRS = \

-        adb \
-       cdb \
-        graphics \
-        hidsystem \
-       network \

        nvram \
        nvram \

-        pci \

        platform \
        power \
        pwr_mgt \
        rtc \
        platform \
        power \
        pwr_mgt \
        rtc \

-       scsi \
-       storage \

        system_management
 
        system_management
 

-INSTINC_SUBDIRS_PPC = \
-       ppc \
-       ndrvsupport
-
-INSTINC_SUBDIRS_I386 = \
-       i386 \
-       ps2
-

 EXPINC_SUBDIRS = ${INSTINC_SUBDIRS}
 EXPINC_SUBDIRS = ${INSTINC_SUBDIRS}

-EXPINC_SUBDIRS_PPC = ${INSTINC_SUBDIRS_PPC}
-EXPINC_SUBDIRS_I386 = ${INSTINC_SUBDIRS_I386}
-
-NOT_EXPORT_HEADERS = 
-NOT_LOCAL_HEADERS = 

 
 

+# By default, everything in xnu/iokit/IOKit gets installed into 
+# Kernel.framework/Headers/IOKit AND Kernel.framework/PrivateHeaders/IOKit.
+# This is so the files with #ifdef ...PRIVATE portions can be processed.
+# xnu/README documents the INSTALL* and EXPORT_MI_DIR lists.

 ALL_HEADERS = $(shell (cd $(SOURCE); echo *.h))
 
 ALL_HEADERS = $(shell (cd $(SOURCE); echo *.h))
 

+# Do not install these headers (anywhere).
+NOT_EXPORT_HEADERS = IOInterruptAccountingPrivate.h
+
+# Install these only in Kernel.framework's PrivateHeaders (not Headers).
+NOT_KF_MI_HEADERS  = $(NOT_EXPORT_HEADERS)                     \
+                    IOKitKeysPrivate.h IOCPU.h                 \
+                    IOHibernatePrivate.h IOPolledInterface.h   \
+                    IOCommandQueue.h IOLocksPrivate.h          \
+                    IOSyncer.h AppleKeyStoreInterface.h        \
+                    IOStatistics.h IOStatisticsPrivate.h       \
+                    IOKernelReporters.h
+
+# These should be additionally installed in IOKit.framework's public Headers

 INSTALL_MI_LIST        = IOBSD.h IOKitKeys.h IOKitServer.h IOReturn.h\
                  IOSharedLock.h IOTypes.h OSMessageNotification.h\
 INSTALL_MI_LIST        = IOBSD.h IOKitKeys.h IOKitServer.h IOReturn.h\
                  IOSharedLock.h IOTypes.h OSMessageNotification.h\

-                 IODataQueueShared.h IOMessage.h
-                  
-INSTALL_MI_LCL_LIST = ""
+                 IODataQueueShared.h IOMessage.h IOInterruptAccounting.h\
+
+# These should be additionally installed in IOKit.framework's PrivateHeaders
+INSTALL_MI_LCL_LIST = IOKitKeysPrivate.h IOHibernatePrivate.h \
+                                         IOLocksPrivate.h IOStatistics.h \
+                                         AppleKeyStoreInterface.h  \
+                                         IOReportTypes.h IOKernelReportStructs.h \
+                                         IOReportMacros.h

 
 INSTALL_MI_DIR = .
 
 
 INSTALL_MI_DIR = .
 


@@ -55,5 +60,7 @@ EXPORT_MI_LIST        = $(filter-out $(NOT_EXPORT_HEADERS), $(ALL_HEADERS))
 
 EXPORT_MI_DIR = IOKit
 
 
 EXPORT_MI_DIR = IOKit
 

+INSTALL_KF_MI_LIST = $(filter-out $(NOT_KF_MI_HEADERS), $(ALL_HEADERS))
+

 include $(MakeInc_rule)
 include $(MakeInc_dir)
 include $(MakeInc_rule)
 include $(MakeInc_dir)