libzpool: remove global libzpool includes

Only include the zfs headers where they're currently required to
compile.  Unfortunately, including zfs_ioctl.h in user space pulls
in a bunch of internal zfs headers as a side effect.  We'll need
to move these structures in to a new shared header to avoid this.
We should not need to add the LIBZPOOL_CPPFLAGS when building the
zed, zinject, zpool, libzfs, ior libzfs_core.

Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: Rob Norris <[email protected]>

Author: behlendorf

cmd/zed/Makefile.am

@@ -3,6 +3,8 @@ include $(srcdir)/%D%/zed.d/Makefile.am
 zed_CFLAGS  = $(AM_CFLAGS)
 zed_CFLAGS += $(LIBUDEV_CFLAGS) $(LIBUUID_CFLAGS)
 
+zed_CPPFLAGS = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
+
 sbin_PROGRAMS   += zed
 CPPCHECKTARGETS += zed
 

cmd/zinject/Makefile.am

@@ -1,6 +1,8 @@
 sbin_PROGRAMS   += zinject
 CPPCHECKTARGETS += zinject
 
+zinject_CPPFLAGS  = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
+
 zinject_SOURCES = \
 	%D%/translate.c \
 	%D%/zinject.c \

cmd/zpool/Makefile.am

@@ -1,7 +1,7 @@
 zpool_CFLAGS  = $(AM_CFLAGS)
 zpool_CFLAGS += $(LIBBLKID_CFLAGS) $(LIBUUID_CFLAGS)
 
-zpool_CPPFLAGS  = $(AM_CPPFLAGS)
+zpool_CPPFLAGS  = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
 zpool_CPPFLAGS += -I$(srcdir)/%D%
 
 sbin_PROGRAMS   += zpool

config/Rules.am

@@ -74,4 +74,5 @@ LIBRARY_CFLAGS      = -no-suppress
 # Since ZFS_DEBUG can change shared data structures, all libzpool users must
 # be compiled with the same flags.
 # See https://github.com/openzfs/zfs/issues/16476
-LIBZPOOL_CPPFLAGS = -DDEBUG -UNDEBUG -DZFS_DEBUG
+LIBZPOOL_CPPFLAGS  = -DDEBUG -UNDEBUG -DZFS_DEBUG
+LIBZPOOL_CPPFLAGS += -I$(top_srcdir)/include/os/@ac_system_l@/zfs

contrib/pam_zfs_key/Makefile.am

@@ -1,6 +1,8 @@
 %C%_pam_zfs_key_la_CFLAGS  = $(AM_CFLAGS)
 %C%_pam_zfs_key_la_CFLAGS += $(LIBCRYPTO_CFLAGS)
 
+pam_zfs_key_la_CPPFLAGS  = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
+
 pammodule_LTLIBRARIES = %D%/pam_zfs_key.la
 
 %C%_pam_zfs_key_la_SOURCES = %D%/pam_zfs_key.c

lib/libspl/taskq.c

@@ -29,7 +29,12 @@
  * Copyright (c) 2014 by Delphix. All rights reserved.
  */
 
-#include <sys/zfs_context.h>
+#include <sys/sysmacros.h>
+#include <sys/timer.h>
+#include <sys/types.h>
+#include <sys/thread.h>
+#include <sys/taskq.h>
+#include <sys/kmem.h>
 
 int taskq_now;
 taskq_t *system_taskq;

lib/libzdb/Makefile.am

@@ -1,6 +1,8 @@
 libzdb_la_CFLAGS = $(AM_CFLAGS) $(LIBRARY_CFLAGS)
 libzdb_la_CFLAGS += -fvisibility=hidden
 
+libzdb_la_CPPFLAGS  = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
+
 noinst_LTLIBRARIES += libzdb.la
 
 libzdb_la_SOURCES = \

lib/libzfs/Makefile.am

@@ -2,6 +2,8 @@ libzfs_la_CFLAGS  = $(AM_CFLAGS) $(LIBRARY_CFLAGS)
 libzfs_la_CFLAGS += $(LIBCRYPTO_CFLAGS) $(ZLIB_CFLAGS)
 libzfs_la_CFLAGS += -fvisibility=hidden
 
+libzfs_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
+
 lib_LTLIBRARIES += libzfs.la
 CPPCHECKTARGETS += libzfs.la
 

lib/libzfs/libzfs_crypto.c

@@ -19,7 +19,6 @@
  * Copyright 2020 Joyent, Inc.
  */
 
-#include <sys/zfs_context.h>
 #include <sys/fs/zfs.h>
 #include <sys/dsl_crypt.h>
 #include <libintl.h>

lib/libzfs_core/Makefile.am

@@ -1,7 +1,7 @@
 libzfs_core_la_CFLAGS  = $(AM_CFLAGS) $(LIBRARY_CFLAGS)
 libzfs_core_la_CFLAGS += -fvisibility=hidden
 
-libzfs_core_la_CPPFLAGS  = $(AM_CPPFLAGS)
+libzfs_core_la_CPPFLAGS  = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
 libzfs_core_la_CPPFLAGS += -I$(srcdir)/%D%
 
 lib_LTLIBRARIES += libzfs_core.la