X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/91447636331957f3d9b5ca5b508f07c526b0074d..3903760236c30e3b5ace7a4eefac3a269d68957c:/iokit/IOKit/Makefile

diff --git a/iokit/IOKit/Makefile b/iokit/IOKit/Makefile
index fdcf6ccb7..008d33e7e 100644
--- a/iokit/IOKit/Makefile
+++ b/iokit/IOKit/Makefile
@@ -3,9 +3,13 @@ export MakeInc_def=${SRCROOT}/makedefs/MakeInc.def
 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)
@@ -18,29 +22,38 @@ INSTINC_SUBDIRS = \
 	rtc \
 	system_management
 
-INSTINC_SUBDIRS_PPC = \
-	ppc
-
-INSTINC_SUBDIRS_I386 = \
-	i386
 
 EXPINC_SUBDIRS = ${INSTINC_SUBDIRS}
-EXPINC_SUBDIRS_PPC = ${INSTINC_SUBDIRS_PPC}
-EXPINC_SUBDIRS_I386 = ${INSTINC_SUBDIRS_I386}
-
-NOT_EXPORT_HEADERS = 
 
-NOT_KF_MI_HEADERS  = $(NOT_EXPORT_HEADERS) IOKitKeysPrivate.h IOCPU.h IOPolledInterface.h
+# 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))
 
-NOT_LOCAL_HEADERS = 
+# Do not install these headers (anywhere).
+NOT_EXPORT_HEADERS = IOInterruptAccountingPrivate.h
 
-ALL_HEADERS = $(shell (cd $(SOURCE); echo *.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\
-		  IODataQueueShared.h IOMessage.h
-                  
-INSTALL_MI_LCL_LIST = IOKitKeysPrivate.h
+		  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 = .