add-ons/kernel: Use UsePrivateKernelHeaders where appropriate

This commit is contained in:
Pawel Dziepak
2014-01-20 04:09:12 +01:00
parent 59b9b52aaf
commit 1a5afe0404
26 changed files with 41 additions and 27 deletions
@@ -1,7 +1,8 @@
SubDir HAIKU_TOP src add-ons kernel bus_managers firewire ; SubDir HAIKU_TOP src add-ons kernel bus_managers firewire ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
UsePrivateHeaders firewire kernel ; UsePrivateHeaders firewire ;
UsePrivateKernelHeaders ;
DEFINES += _KERNEL=1 ; DEFINES += _KERNEL=1 ;
@@ -1,7 +1,8 @@
SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 sis7018 ; SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 sis7018 ;
UsePrivateHeaders kernel media ; UsePrivateKernelHeaders ;
UsePrivateHeaders media ;
UsePrivateHeaders [ FDirName kernel util ] ; UsePrivateHeaders [ FDirName kernel util ] ;
@@ -1,7 +1,8 @@
SubDir HAIKU_TOP src add-ons kernel drivers bus firewire ; SubDir HAIKU_TOP src add-ons kernel drivers bus firewire ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
UsePrivateHeaders firewire kernel ; UsePrivateHeaders firewire ;
UsePrivateKernelHeaders ;
SubDirCcFlags [ FDefines _KERNEL=1 ] ; SubDirCcFlags [ FDefines _KERNEL=1 ] ;
+1 -1
View File
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers bus usb ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ; SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ;
UsePrivateHeaders kernel ; UsePrivateKernelHeaders ;
if $(TARGET_PLATFORM) != haiku { if $(TARGET_PLATFORM) != haiku {
UsePublicHeaders [ FDirName drivers ] ; UsePublicHeaders [ FDirName drivers ] ;
} }
+1 -1
View File
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src add-ons kernel drivers common ; SubDir HAIKU_TOP src add-ons kernel drivers common ;
UsePrivateHeaders kernel ; UsePrivateKernelHeaders ;
KernelAddon dprintf : KernelAddon dprintf :
dprintf.cpp dprintf.cpp
@@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers disk floppy pc_floppy ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders drivers kernel ; UsePrivateHeaders drivers ;
UsePrivateKernelHeaders ;
KernelAddon pc_floppy : KernelAddon pc_floppy :
floppy.c floppy.c
@@ -1,7 +1,8 @@
SubDir HAIKU_TOP src add-ons kernel drivers disk usb usb_disk ; SubDir HAIKU_TOP src add-ons kernel drivers disk usb usb_disk ;
SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ; SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ;
UsePrivateHeaders drivers kernel ; UsePrivateHeaders drivers ;
UsePrivateKernelHeaders ;
KernelAddon usb_disk : KernelAddon usb_disk :
usb_disk.cpp usb_disk.cpp
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel drivers disk usb usb_floppy ; SubDir HAIKU_TOP src add-ons kernel drivers disk usb usb_floppy ;
SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ; SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ;
UsePrivateHeaders kernel ; UsePrivateKernelHeaders ;
KernelAddon usb_floppy : KernelAddon usb_floppy :
usb_disk.cpp usb_disk.cpp
@@ -9,7 +9,7 @@ if $(TARGET_PLATFORM) = haiku {
# lock.h wants debug.h and others. # lock.h wants debug.h and others.
#UsePrivateHeaders kernel ; #UsePrivateHeaders kernel ;
#UsePublicHeaders kernel ; #UsePublicHeaders kernel ;
UsePrivateHeaders [ FDirName kernel ] ; UsePrivateKernelHeaders ;
} }
KernelAddon nbd : KernelAddon nbd :
@@ -4,8 +4,8 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders [ FDirName graphics intel_extreme ] ; UsePrivateHeaders [ FDirName graphics intel_extreme ] ;
UsePrivateHeaders [ FDirName graphics common ] ; UsePrivateHeaders [ FDirName graphics common ] ;
UsePrivateHeaders graphics kernel ; UsePrivateHeaders graphics ;
UsePrivateHeaders shared ; UsePrivateKernelHeaders ;
KernelAddon intel_extreme : KernelAddon intel_extreme :
bios.cpp bios.cpp
@@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers network sis19x ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders kernel net ; UsePrivateKernelHeaders ;
UsePrivateHeaders net ;
UsePrivateHeaders [ FDirName kernel util ] ; UsePrivateHeaders [ FDirName kernel util ] ;
@@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers network usb_ecm ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders kernel net ; UsePrivateKernelHeaders ;
UsePrivateHeaders net ;
KernelAddon usb_ecm : KernelAddon usb_ecm :
Driver.cpp Driver.cpp
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel drivers printer usb ; SubDir HAIKU_TOP src add-ons kernel drivers printer usb ;
SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ; SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ;
UsePrivateHeaders kernel ; UsePrivateKernelHeaders ;
KernelAddon usb_printer : KernelAddon usb_printer :
usb_printer.cpp usb_printer.cpp
+1 -1
View File
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src add-ons kernel file_systems fat ; SubDir HAIKU_TOP src add-ons kernel file_systems fat ;
UsePrivateHeaders kernel ; UsePrivateKernelHeaders ;
SubDirCcFlags -DTRACK_FILENAME ; SubDirCcFlags -DTRACK_FILENAME ;
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel file_systems googlefs ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders kernel ; UsePrivateKernelHeaders ;
#SubDirCcFlags -DTRACK_FILENAME ; #SubDirCcFlags -DTRACK_FILENAME ;
#SubDirCcFlags -DDEBUG_GOOGLEFS=1 ; #SubDirCcFlags -DDEBUG_GOOGLEFS=1 ;
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src add-ons kernel file_systems iso9660 ; SubDir HAIKU_TOP src add-ons kernel file_systems iso9660 ;
UsePrivateHeaders kernel ; UsePrivateKernelHeaders ;
# set some additional defines # set some additional defines
SubDirC++Flags -fno-rtti ; SubDirC++Flags -fno-rtti ;
+1 -1
View File
@@ -6,7 +6,7 @@ SubDirHdrs [ FDirName $(SUBDIR) utils ] ;
SubDirCcFlags -DHAVE_CONFIG_H=1 ; SubDirCcFlags -DHAVE_CONFIG_H=1 ;
SubDirC++Flags -DHAVE_CONFIG_H=1 ; SubDirC++Flags -DHAVE_CONFIG_H=1 ;
UsePrivateHeaders kernel ; UsePrivateKernelHeaders ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) utils ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) utils ] ;
@@ -4,7 +4,7 @@ local userlandFSTop = [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems
userlandfs ] ; userlandfs ] ;
local userlandFSIncludes = [ PrivateHeaders userlandfs ] ; local userlandFSIncludes = [ PrivateHeaders userlandfs ] ;
UsePrivateHeaders kernel ; UsePrivateKernelHeaders ;
SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ; SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ;
SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ; SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ;
@@ -1,6 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel generic ata_adapter ; SubDir HAIKU_TOP src add-ons kernel generic ata_adapter ;
UsePrivateHeaders drivers kernel ; UsePrivateHeaders drivers ;
UsePrivateKernelHeaders ;
KernelAddon ata_adapter : KernelAddon ata_adapter :
ata_adapter.cpp ata_adapter.cpp
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src add-ons kernel generic locked_pool ; SubDir HAIKU_TOP src add-ons kernel generic locked_pool ;
UsePrivateHeaders kernel ; UsePrivateKernelHeaders ;
# enable debug output, if debugging is enabled # enable debug output, if debugging is enabled
if $(DEBUG) != 0 { if $(DEBUG) != 0 {
@@ -1,6 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel generic scsi_periph ; SubDir HAIKU_TOP src add-ons kernel generic scsi_periph ;
UsePrivateHeaders drivers kernel shared ; UsePrivateHeaders drivers ;
UsePrivateKernelHeaders ;
SubDirHdrs $(HAIKU_TOP) src system kernel device_manager ; SubDirHdrs $(HAIKU_TOP) src system kernel device_manager ;
# disable debug output, if debugging is disabled # disable debug output, if debugging is disabled
@@ -10,7 +10,8 @@ if $(TARGET_PLATFORM) != haiku {
# Unfortunately we get more than we want, namely all POSIX headers. # Unfortunately we get more than we want, namely all POSIX headers.
} }
UsePrivateHeaders kernel net ; UsePrivateKernelHeaders ;
UsePrivateHeaders net ;
KernelAddon ethernet_frame : KernelAddon ethernet_frame :
ethernet_frame.cpp ethernet_frame.cpp
@@ -10,7 +10,8 @@ if $(TARGET_PLATFORM) != haiku {
# Unfortunately we get more than we want, namely all POSIX headers. # Unfortunately we get more than we want, namely all POSIX headers.
} }
UsePrivateHeaders kernel net ; UsePrivateKernelHeaders ;
UsePrivateHeaders net ;
KernelAddon loopback_frame : KernelAddon loopback_frame :
loopback_frame.cpp loopback_frame.cpp
@@ -10,7 +10,8 @@ if $(TARGET_PLATFORM) != haiku {
# Unfortunately we get more than we want, namely all POSIX headers. # Unfortunately we get more than we want, namely all POSIX headers.
} }
UsePrivateHeaders kernel net ; UsePrivateKernelHeaders ;
UsePrivateHeaders net ;
KernelAddon loopback : KernelAddon loopback :
loopback.cpp loopback.cpp
@@ -1,7 +1,8 @@
SubDir HAIKU_TOP src add-ons kernel network protocols icmp ; SubDir HAIKU_TOP src add-ons kernel network protocols icmp ;
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ipv4 ] ; UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ipv4 ] ;
UsePrivateHeaders kernel net ; UsePrivateKernelHeaders ;
UsePrivateHeaders net ;
KernelAddon icmp : KernelAddon icmp :
icmp.cpp icmp.cpp
@@ -10,7 +10,8 @@ if $(TARGET_PLATFORM) != haiku {
# Unfortunately we get more than we want, namely all POSIX headers. # Unfortunately we get more than we want, namely all POSIX headers.
} }
UsePrivateHeaders kernel net ; UsePrivateKernelHeaders ;
UsePrivateHeaders net ;
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network datalink_protocols ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network datalink_protocols ] : true ;