summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2022-07-29 01:00:00 +0300
committerToomas Soome <tsoome@me.com>2022-09-23 09:40:48 +0300
commita3eabe598a0af8378581201cb0d027e3589fd3f7 (patch)
treec8a0cd82cef632914c1ba8d56836e4c6d1ea1627 /usr
parent61b899723556289ed14dbcc0792ee6ed33c3edf9 (diff)
downloadillumos-gate-a3eabe598a0af8378581201cb0d027e3589fd3f7.tar.gz
14863 Makefile.syshdrs: machine specific headers appear to be quite common
Reviewed by: Richard Lowe <richlowe@richlowe.net> Reviewed by: Andrew Stormont <andyjstormont@gmail.com> Approved by: Patrick Mooney <pmooney@pfmooney.com>
Diffstat (limited to 'usr')
-rw-r--r--usr/src/uts/common/sys/Makefile6
-rw-r--r--usr/src/uts/common/sys/Makefile.syshdrs23
2 files changed, 14 insertions, 15 deletions
diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile
index 7aae55e661..70c8342377 100644
--- a/usr/src/uts/common/sys/Makefile
+++ b/usr/src/uts/common/sys/Makefile
@@ -1207,6 +1207,7 @@ CHECKHDRS= \
$(ROOTAVHDRS) \
$(ROOTCRYPTOHDRS) \
$(ROOTDCAMHDRS) \
+ $(ROOTDKTPHDRS) \
$(ROOTISOHDRS) \
$(ROOTIDMHDRS) \
$(ROOTISCSIHDRS) \
@@ -1228,6 +1229,7 @@ CHECKHDRS= \
$(ROOTIBMFHDRS) \
$(ROOTOFHDRS) \
$(ROOTRDMAHDRS) \
+ $(ROOTSATAGENHDRS) \
$(ROOTSOL_OFSHDRS) \
$(ROOTSOL_UMADHDRS) \
$(ROOTSOL_UVERBSHDRS) \
@@ -1243,6 +1245,7 @@ CHECKHDRS= \
$(ROOTSCSIGENHDRS) \
$(ROOTSCSIIMPLHDRS) \
$(ROOTSCSIVHCIHDRS) \
+ $(ROOTSCSITARGETSHDRS) \
$(ROOTSDCARDHDRS) \
$(ROOTSYSEVENTHDRS) \
$(ROOTCONTRACTHDRS) \
@@ -1276,6 +1279,7 @@ install_h: \
$(ROOTAVHDRS) \
$(ROOTCRYPTOHDRS) \
$(ROOTDCAMHDRS) \
+ $(ROOTDKTPHDRS) \
$(ROOTISOHDRS) \
$(ROOTIDMHDRS) \
$(ROOTISCSIHDRS) \
@@ -1297,6 +1301,7 @@ install_h: \
$(ROOTIBMFHDRS) \
$(ROOTOFHDRS) \
$(ROOTRDMAHDRS) \
+ $(ROOTSATAGENHDRS) \
$(ROOTSOL_OFSHDRS) \
$(ROOTSOL_UMADHDRS) \
$(ROOTSOL_UVERBSHDRS) \
@@ -1312,6 +1317,7 @@ install_h: \
$(ROOTSCSIGENHDRS) \
$(ROOTSCSIIMPLHDRS) \
$(ROOTSCSIVHCIHDRS) \
+ $(ROOTSCSITARGETSHDRS) \
$(ROOTSDCARDHDRS) \
$(ROOTSYSEVENTHDRS) \
$(ROOTCONTRACTHDRS) \
diff --git a/usr/src/uts/common/sys/Makefile.syshdrs b/usr/src/uts/common/sys/Makefile.syshdrs
index 54a89a5e9a..b4b508cad4 100644
--- a/usr/src/uts/common/sys/Makefile.syshdrs
+++ b/usr/src/uts/common/sys/Makefile.syshdrs
@@ -173,19 +173,11 @@ tsol/%.check: tsol/%.h
ROOTDIR= $(ROOT)/usr/include/sys
-ROOTDKTPDIR= $(ROOTDIR)/dktp
-
-sparc_ROOTDIRS= $(ROOTDKTPDIR) $(ROOTDIR)/scsi/adapters \
- $(ROOTDIR)/scsi/targets
-
-i386_ROOTDIRS= $(ROOTDKTPDIR) $(ROOTDIR)/scsi/adapters \
- $(ROOTDIR)/scsi/targets \
- $(ROOTDIR)/sata
-
ROOTDIRS= \
$(ROOTDIR) \
$(ROOTDIR)/audio \
$(ROOTDIR)/av \
+ $(ROOTDIR)/dktp \
$(ROOTDIR)/hotplug \
$(ROOTDIR)/hotplug/pci \
$(ROOTDIR)/crypto \
@@ -218,10 +210,13 @@ ROOTDIRS= \
$(ROOTDIR)/ib/clients/of/sol_ucma \
$(ROOTDIR)/idm \
$(ROOTDIR)/iscsit \
+ $(ROOTDIR)/sata \
$(ROOTDIR)/scsi \
+ $(ROOTDIR)/scsi/adapters \
$(ROOTDIR)/scsi/conf \
$(ROOTDIR)/scsi/generic \
$(ROOTDIR)/scsi/impl \
+ $(ROOTDIR)/scsi/targets \
$(ROOTDIR)/sdcard \
$(ROOTDIR)/sysevent \
$(ROOTDIR)/contract \
@@ -290,7 +285,6 @@ ROOTSCSICONFHDRS= $(SCSICONFHDRS:%=$(ROOTDIR)/scsi/conf/%)
ROOTSCSIGENHDRS= $(SCSIGENHDRS:%=$(ROOTDIR)/scsi/generic/%)
ROOTSCSIIMPLHDRS= $(SCSIIMPLHDRS:%=$(ROOTDIR)/scsi/impl/%)
ROOTSCSITARGETSHDRS= $(SCSITARGETSHDRS:%=$(ROOTDIR)/scsi/targets/%)
-ROOTSCSICADHDRS= $(SCSICADHDRS:%=$(ROOTDIR)/scsi/adapters/%)
ROOTSCSIADHDRS= $(SCSICADHDRS:%=$(ROOTDIR)/scsi/adapters/%)
ROOTSCSIVHCIHDRS= $(SCSIVHCIHDRS:%=$(ROOTDIR)/scsi/adapters/%)
ROOTSCSIISCSIHDRS= $(SCSIISCSIHDRS:%=$(ROOTDIR)/scsi/adapters/%)
@@ -323,7 +317,6 @@ ROOT1394HDRS= $(I1394HDRS:%=$(ROOTDIR)/1394/%)
ROOTRSMHDRS= $(RSMHDRS:%=$(ROOTDIR)/rsm/%)
-ROOTSDKTPHDRS= $(SDKTPHDRS:%=$(ROOTDIR)/dktp/%)
ROOTDKTPHDRS= $(DKTPHDRS:%=$(ROOTDIR)/dktp/%)
ROOTPCHDRS= $(PCHDRS:%=$(ROOTDIR)/%)
ROOTHOTPLUGHDRS= $(HOTPLUGHDRS:%=$(ROOTDIR)/hotplug/%)
@@ -331,14 +324,14 @@ ROOTHOTPLUGPCIHDRS= $(HOTPLUGPCIHDRS:%=$(ROOTDIR)/hotplug/pci/%)
ROOTTSOLHDRS= $(TSOLHDRS:%=$(ROOTDIR)/tsol/%)
-sparc_ROOTHDRS= $(ROOTSDKTPHDRS) $(ROOTSCSICADHDRS) $(ROOTSCSITARGETSHDRS) \
+sparc_ROOTHDRS= \
$(ROOTUSBHDRS) $(ROOTUSBHUBDHDRS) \
$(ROOTUSBAUDHDRS) $(ROOTUSBHIDHDRS) $(ROOTUSBMSHDRS) \
$(ROOTUSBPRNHDRS) $(ROOTUGENHDRS) $(ROOTUSBVIDHDRS)
-i386_ROOTHDRS= $(ROOTDKTPHDRS) $(ROOTPCHDRS) $(ROOTSCSITARGETSHDRS) \
- $(ROOTSCSIVHCIHDRS) $(ROOTHOTPLUGHDRS) \
- $(ROOTHOTPLUGPCIHDRS) $(ROOTSATAGENHDRS)
+i386_ROOTHDRS= $(ROOTPCHDRS) \
+ $(ROOTHOTPLUGHDRS) \
+ $(ROOTHOTPLUGPCIHDRS)
# install rules
$(ROOTDIR)/%: %