Minimise the amount of header files and other linux files installed w…

…ith "make install"
openzfsonosx · Aug 28, 2015 · 776d41f · 776d41f
1 parent d30ef37
commit 776d41f
Show file tree

Hide file tree

Showing 17 changed files with 188 additions and 2,467 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -19,7 +19,9 @@ kerneldir = /usr/src/zfs-$(VERSION)/$(LINUX_VERSION)
 nodist_kernel_HEADERS = zfs.release zfs_config.h
 endif
 if CONFIG_USER
-SUBDIRS += udev etc man scripts lib cmd zfs_bundle
+# O3X - trim out linux stuff.
+#SUBDIRS += udev etc man scripts lib cmd zfs_bundle
+SUBDIRS += etc man scripts lib cmd zfs_bundle
 endif
 
 
@@ -42,13 +44,15 @@ distclean-local::
 
 if CONFIG_KERNEL
 install-data-local:
-	release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
-	instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \
-	for instfile in $(noinst_HEADERS); do \
-		parentdir=`dirname $$instdest/$$instfile`; \
-		mkdir -p $$parentdir; \
-		$(INSTALL) $$instfile $$instdest/$$instfile; \
-	done
+
+#    release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
+#	instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \
+#	for instfile in $(noinst_HEADERS); do \
+#		parentdir=`dirname $$instdest/$$instfile`; \
+#		mkdir -p $$parentdir; \
+#		$(INSTALL) $$instfile $$instdest/$$instfile; \
+#	done
+
 endif
 
 

diff --git a/Xcode/zfs.xcodeproj/project.pbxproj b/Xcode/zfs.xcodeproj/project.pbxproj
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
@@ -1,2 +1,6 @@
-SUBDIRS = bash_completion.d dracut initramfs
-DIST_SUBDIRS = bash_completion.d dracut initramfs
+# O3X - trim unwanted linux support code
+#SUBDIRS = bash_completion.d dracut initramfs
+#DIST_SUBDIRS = bash_completion.d dracut initramfs
+
+SUBDIRS = bash_completion.d
+DIST_SUBDIRS = bash_completion.d
diff --git a/etc/Makefile.am b/etc/Makefile.am
@@ -1,2 +1,5 @@
-SUBDIRS = zfs $(ZFS_INIT_LAUNCHD) $(ZFS_INIT_SYSTEMD) $(ZFS_INIT_SYSV) $(ZFS_MODULE_LOAD)
-DIST_SUBDIRS = zfs launchd systemd init.d modules-load.d
+#O3X - remove linux specifics
+#SUBDIRS = zfs $(ZFS_INIT_LAUNCHD) $(ZFS_INIT_SYSTEMD) $(ZFS_INIT_SYSV) $(ZFS_MODULE_LOAD)
+#DIST_SUBDIRS = zfs launchd systemd init.d modules-load.d
+SUBDIRS = zfs $(ZFS_INIT_LAUNCHD)
+DIST_SUBDIRS = zfs launchd
diff --git a/include/Makefile.am b/include/Makefile.am
@@ -21,14 +21,18 @@ USER_H = \
 	$(top_srcdir)/include/libzfs_core.h \
 	$(top_srcdir)/include/libzfs_impl.h
 
-EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+#EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_USER
-libzfsdir = $(includedir)/libzfs
-libzfs_HEADERS = $(COMMON_H) $(USER_H)
+#libzfsdir = $(includedir)/libzfs
+#libzfs_HEADERS = $(COMMON_H) $(USER_H)
+libzfsdir =
+libzfs_HEADERS =
 endif
 
 if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include
-kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+#kerneldir = @prefix@/src/zfs-$(VERSION)/include
+#kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+kerneldir =
+kernel_HEADERS = 
 endif
diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
@@ -9,14 +9,18 @@ KERNEL_H = \
 
 USER_H =
 
-EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+#EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_USER
-libzfsdir = $(includedir)/libzfs/linux
-libzfs_HEADERS = $(COMMON_H) $(USER_H)
+#libzfsdir = $(includedir)/libzfs/linux
+#libzfs_HEADERS = $(COMMON_H) $(USER_H)
+libzfsdir =
+libzfs_HEADERS = 
 endif
 
 if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux
-kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+#kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux
+#kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+kerneldir =
+kernel_HEADERS =
 endif
diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
@@ -94,14 +94,18 @@ KERNEL_H = \
 
 USER_H =
 
-EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+#EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_USER
-libzfsdir = $(includedir)/libzfs/sys
-libzfs_HEADERS = $(COMMON_H) $(USER_H)
+#libzfsdir = $(includedir)/libzfs/sys
+#libzfs_HEADERS = $(COMMON_H) $(USER_H)
+libzfsdir =
+libzfs_HEADERS =
 endif
 
 if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys
-kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+#kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys
+#kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+kerneldir =
+kernel_HEADERS = 
 endif
diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
@@ -8,14 +8,18 @@ KERNEL_H =
 
 USER_H =
 
-EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+#EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_USER
-libzfsdir = $(includedir)/libzfs/sys/fm
-libzfs_HEADERS = $(COMMON_H) $(USER_H)
+#libzfsdir = $(includedir)/libzfs/sys/fm
+#libzfs_HEADERS = $(COMMON_H) $(USER_H)
+libzfsdir =
+libzfs_HEADERS =
 endif
 
 if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm
-kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+#kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm
+#kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+kerneldir =
+kernel_HEADERS = 
 endif
diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am
@@ -5,14 +5,18 @@ KERNEL_H =
 
 USER_H =
 
-EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+#EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_USER
-libzfsdir = $(includedir)/libzfs/sys/fm/fs
-libzfs_HEADERS = $(COMMON_H) $(USER_H)
+#libzfsdir = $(includedir)/libzfs/sys/fm/fs
+#libzfs_HEADERS = $(COMMON_H) $(USER_H)
+libzfsdir =
+libzfs_HEADERS =
 endif
 
 if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs
-kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+#kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs
+#kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+kerneldir =
+kernel_HEADERS = 
 endif
diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
@@ -5,14 +5,18 @@ KERNEL_H =
 
 USER_H =
 
-EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+#EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_USER
-libzfsdir = $(includedir)/libzfs/sys/fs
-libzfs_HEADERS = $(COMMON_H) $(USER_H)
+#libzfsdir = $(includedir)/libzfs/sys/fs
+#libzfs_HEADERS = $(COMMON_H) $(USER_H)
+libzfsdir =
+libzfs_HEADERS =
 endif
 
 if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fs
-kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+#kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fs
+#kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+kerneldir =
+kernel_HEADERS =
 endif
diff --git a/lib/libspl/include/Makefile.am b/lib/libspl/include/Makefile.am
@@ -1,28 +1,31 @@
 SUBDIRS = ia32 rpc sys util
-
 libspldir = $(includedir)/libspl
-libspl_HEADERS = \
-	$(top_srcdir)/lib/libspl/include/assert.h \
-	$(top_srcdir)/lib/libspl/include/atomic.h \
-	$(top_srcdir)/lib/libspl/include/attr.h \
-	$(top_srcdir)/lib/libspl/include/devid.h \
-	$(top_srcdir)/lib/libspl/include/libdevinfo.h \
-	$(top_srcdir)/lib/libspl/include/libgen.h \
-	$(top_srcdir)/lib/libspl/include/libshare.h \
-	$(top_srcdir)/lib/libspl/include/limits.h \
-	$(top_srcdir)/lib/libspl/include/locale.h \
-	$(top_srcdir)/lib/libspl/include/note.h \
-	$(top_srcdir)/lib/libspl/include/priv.h \
-	$(top_srcdir)/lib/libspl/include/statcommon.h \
-	$(top_srcdir)/lib/libspl/include/stdio.h \
-	$(top_srcdir)/lib/libspl/include/stdlib.h \
-	$(top_srcdir)/lib/libspl/include/string.h \
-	$(top_srcdir)/lib/libspl/include/strings.h \
-	$(top_srcdir)/lib/libspl/include/stropts.h \
-	$(top_srcdir)/lib/libspl/include/synch.h \
-	$(top_srcdir)/lib/libspl/include/thread.h \
-	$(top_srcdir)/lib/libspl/include/tzfile.h \
-	$(top_srcdir)/lib/libspl/include/ucred.h \
-	$(top_srcdir)/lib/libspl/include/umem.h \
-	$(top_srcdir)/lib/libspl/include/unistd.h \
-	$(top_srcdir)/lib/libspl/include/zone.h
+
+# O3X - prevent header installation
+#libspl_HEADERS = \
+#	$(top_srcdir)/lib/libspl/include/assert.h \
+#	$(top_srcdir)/lib/libspl/include/atomic.h \
+#	$(top_srcdir)/lib/libspl/include/attr.h \
+#	$(top_srcdir)/lib/libspl/include/devid.h \
+#	$(top_srcdir)/lib/libspl/include/libdevinfo.h \
+#	$(top_srcdir)/lib/libspl/include/libgen.h \
+#	$(top_srcdir)/lib/libspl/include/libshare.h \
+#	$(top_srcdir)/lib/libspl/include/limits.h \
+#	$(top_srcdir)/lib/libspl/include/locale.h \
+#	$(top_srcdir)/lib/libspl/include/note.h \
+#	$(top_srcdir)/lib/libspl/include/priv.h \
+#	$(top_srcdir)/lib/libspl/include/statcommon.h \
+#	$(top_srcdir)/lib/libspl/include/stdio.h \
+#	$(top_srcdir)/lib/libspl/include/stdlib.h \
+#	$(top_srcdir)/lib/libspl/include/string.h \
+#	$(top_srcdir)/lib/libspl/include/strings.h \
+#	$(top_srcdir)/lib/libspl/include/stropts.h \
+#	$(top_srcdir)/lib/libspl/include/synch.h \
+#	$(top_srcdir)/lib/libspl/include/thread.h \
+#	$(top_srcdir)/lib/libspl/include/tzfile.h \
+#	$(top_srcdir)/lib/libspl/include/ucred.h \
+#	$(top_srcdir)/lib/libspl/include/umem.h \
+#	$(top_srcdir)/lib/libspl/include/unistd.h \
+#	$(top_srcdir)/lib/libspl/include/zone.h
+
+libspl_HEADERS =
diff --git a/lib/libspl/include/ia32/sys/Makefile.am b/lib/libspl/include/ia32/sys/Makefile.am
@@ -1,3 +1,7 @@
 libspldir = $(includedir)/libspl/ia32/sys
-libspl_HEADERS = \
-        $(top_srcdir)/lib/libspl/include/ia32/sys/asm_linkage.h
+
+#O3X - prevent header install
+#libspl_HEADERS = \
+#        $(top_srcdir)/lib/libspl/include/ia32/sys/asm_linkage.h
+
+libspl_HEADERS =
diff --git a/lib/libspl/include/rpc/Makefile.am b/lib/libspl/include/rpc/Makefile.am
@@ -1,4 +1,7 @@
 libspldir = $(includedir)/libspl/rpc
-libspl_HEADERS = \
-	$(top_srcdir)/lib/libspl/include/rpc/types.h \
-	$(top_srcdir)/lib/libspl/include/rpc/xdr.h
+
+# O3X - prevent header install
+#libspl_HEADERS = \
+#	$(top_srcdir)/lib/libspl/include/rpc/types.h \
+#	$(top_srcdir)/lib/libspl/include/rpc/xdr.h
+libspl_HEADERS =
diff --git a/lib/libspl/include/sys/Makefile.am b/lib/libspl/include/sys/Makefile.am
@@ -1,55 +1,60 @@
 SUBDIRS = dktp sysevent
 
 libspldir = $(includedir)/libspl/sys
-libspl_HEADERS = \
-	$(top_srcdir)/lib/libspl/include/sys/acl.h \
-	$(top_srcdir)/lib/libspl/include/sys/acl_impl.h \
-	$(top_srcdir)/lib/libspl/include/sys/bitmap.h \
-	$(top_srcdir)/lib/libspl/include/sys/byteorder.h \
-	$(top_srcdir)/lib/libspl/include/sys/callb.h \
-	$(top_srcdir)/lib/libspl/include/sys/cmn_err.h \
-	$(top_srcdir)/lib/libspl/include/sys/compress.h \
-	$(top_srcdir)/lib/libspl/include/sys/cred.h \
-	$(top_srcdir)/lib/libspl/include/sys/debug.h \
-	$(top_srcdir)/lib/libspl/include/sys/dkio.h \
-	$(top_srcdir)/lib/libspl/include/sys/dklabel.h \
-	$(top_srcdir)/lib/libspl/include/sys/feature_tests.h \
-	$(top_srcdir)/lib/libspl/include/sys/file.h \
-	$(top_srcdir)/lib/libspl/include/sys/frame.h \
-	$(top_srcdir)/lib/libspl/include/sys/int_limits.h \
-	$(top_srcdir)/lib/libspl/include/sys/int_types.h \
-	$(top_srcdir)/lib/libspl/include/sys/inttypes.h \
-	$(top_srcdir)/lib/libspl/include/sys/isa_defs.h \
-	$(top_srcdir)/lib/libspl/include/sys/kmem.h \
-	$(top_srcdir)/lib/libspl/include/sys/kstat.h \
-	$(top_srcdir)/lib/libspl/include/sys/list.h \
-	$(top_srcdir)/lib/libspl/include/sys/list_impl.h \
-	$(top_srcdir)/lib/libspl/include/sys/mhd.h \
-	$(top_srcdir)/lib/libspl/include/sys/mkdev.h \
-	$(top_srcdir)/lib/libspl/include/sys/mntent.h \
-	$(top_srcdir)/lib/libspl/include/sys/mnttab.h \
-	$(top_srcdir)/lib/libspl/include/sys/mount.h \
-	$(top_srcdir)/lib/libspl/include/sys/note.h \
-	$(top_srcdir)/lib/libspl/include/sys/param.h \
-	$(top_srcdir)/lib/libspl/include/sys/policy.h \
-	$(top_srcdir)/lib/libspl/include/sys/priv.h \
-	$(top_srcdir)/lib/libspl/include/sys/processor.h \
-	$(top_srcdir)/lib/libspl/include/sys/sdt.h \
-	$(top_srcdir)/lib/libspl/include/sys/stack.h \
-	$(top_srcdir)/lib/libspl/include/sys/stat.h \
-	$(top_srcdir)/lib/libspl/include/sys/stropts.h \
-	$(top_srcdir)/lib/libspl/include/sys/sunddi.h \
-	$(top_srcdir)/lib/libspl/include/sys/sysevent.h \
-	$(top_srcdir)/lib/libspl/include/sys/sysmacros.h \
-	$(top_srcdir)/lib/libspl/include/sys/systeminfo.h \
-	$(top_srcdir)/lib/libspl/include/sys/systm.h \
-	$(top_srcdir)/lib/libspl/include/sys/time.h \
-	$(top_srcdir)/lib/libspl/include/sys/types32.h \
-	$(top_srcdir)/lib/libspl/include/sys/types.h \
-	$(top_srcdir)/lib/libspl/include/sys/tzfile.h \
-	$(top_srcdir)/lib/libspl/include/sys/uio.h \
-	$(top_srcdir)/lib/libspl/include/sys/va_list.h \
-	$(top_srcdir)/lib/libspl/include/sys/varargs.h \
-	$(top_srcdir)/lib/libspl/include/sys/vnode.h \
-	$(top_srcdir)/lib/libspl/include/sys/vtoc.h \
-	$(top_srcdir)/lib/libspl/include/sys/zone.h
+
+# O3X - prevent header install
+#libspl_HEADERS = \
+#	$(top_srcdir)/lib/libspl/include/sys/acl.h \
+#	$(top_srcdir)/lib/libspl/include/sys/acl_impl.h \
+#	$(top_srcdir)/lib/libspl/include/sys/bitmap.h \
+#	$(top_srcdir)/lib/libspl/include/sys/byteorder.h \
+#	$(top_srcdir)/lib/libspl/include/sys/callb.h \
+#	$(top_srcdir)/lib/libspl/include/sys/cmn_err.h \
+#	$(top_srcdir)/lib/libspl/include/sys/compress.h \
+#	$(top_srcdir)/lib/libspl/include/sys/cred.h \
+#	$(top_srcdir)/lib/libspl/include/sys/debug.h \
+#	$(top_srcdir)/lib/libspl/include/sys/dkio.h \
+#	$(top_srcdir)/lib/libspl/include/sys/dklabel.h \
+#	$(top_srcdir)/lib/libspl/include/sys/feature_tests.h \
+#	$(top_srcdir)/lib/libspl/include/sys/file.h \
+#	$(top_srcdir)/lib/libspl/include/sys/frame.h \
+#	$(top_srcdir)/lib/libspl/include/sys/int_limits.h \
+#	$(top_srcdir)/lib/libspl/include/sys/int_types.h \
+#	$(top_srcdir)/lib/libspl/include/sys/inttypes.h \
+#	$(top_srcdir)/lib/libspl/include/sys/isa_defs.h \
+#	$(top_srcdir)/lib/libspl/include/sys/kmem.h \
+#	$(top_srcdir)/lib/libspl/include/sys/kstat.h \
+#	$(top_srcdir)/lib/libspl/include/sys/list.h \
+#	$(top_srcdir)/lib/libspl/include/sys/list_impl.h \
+#	$(top_srcdir)/lib/libspl/include/sys/mhd.h \
+#	$(top_srcdir)/lib/libspl/include/sys/mkdev.h \
+#	$(top_srcdir)/lib/libspl/include/sys/mntent.h \
+#	$(top_srcdir)/lib/libspl/include/sys/mnttab.h \
+#	$(top_srcdir)/lib/libspl/include/sys/mount.h \
+#	$(top_srcdir)/lib/libspl/include/sys/note.h \
+#	$(top_srcdir)/lib/libspl/include/sys/param.h \
+#	$(top_srcdir)/lib/libspl/include/sys/policy.h \
+#	$(top_srcdir)/lib/libspl/include/sys/priv.h \
+#	$(top_srcdir)/lib/libspl/include/sys/processor.h \
+#	$(top_srcdir)/lib/libspl/include/sys/sdt.h \
+#	$(top_srcdir)/lib/libspl/include/sys/stack.h \
+#	$(top_srcdir)/lib/libspl/include/sys/stat.h \
+#	$(top_srcdir)/lib/libspl/include/sys/stropts.h \
+#	$(top_srcdir)/lib/libspl/include/sys/sunddi.h \
+#	$(top_srcdir)/lib/libspl/include/sys/sysevent.h \
+#	$(top_srcdir)/lib/libspl/include/sys/sysmacros.h \
+#	$(top_srcdir)/lib/libspl/include/sys/systeminfo.h \
+#	$(top_srcdir)/lib/libspl/include/sys/systm.h \
+#	$(top_srcdir)/lib/libspl/include/sys/time.h \
+#	$(top_srcdir)/lib/libspl/include/sys/types32.h \
+#	$(top_srcdir)/lib/libspl/include/sys/types.h \
+#	$(top_srcdir)/lib/libspl/include/sys/tzfile.h \
+#	$(top_srcdir)/lib/libspl/include/sys/uio.h \
+#	$(top_srcdir)/lib/libspl/include/sys/va_list.h \
+#	$(top_srcdir)/lib/libspl/include/sys/varargs.h \
+#	$(top_srcdir)/lib/libspl/include/sys/vnode.h \
+#	$(top_srcdir)/lib/libspl/include/sys/vtoc.h \
+#	$(top_srcdir)/lib/libspl/include/sys/zone.h
+
+libspl_HEADERS =
+
diff --git a/lib/libspl/include/sys/dktp/Makefile.am b/lib/libspl/include/sys/dktp/Makefile.am
@@ -1,4 +1,5 @@
 libspldir = $(includedir)/libspl/sys/dktp
-libspl_HEADERS = \
-	$(top_srcdir)/lib/libspl/include/sys/dktp/fdisk.h
-
+#O3X - prevent header install
+#libspl_HEADERS = \
+#	$(top_srcdir)/lib/libspl/include/sys/dktp/fdisk.h
+libspl_HEADERS =