1 files changed, 33 insertions, 17 deletions
diff --git a/cmd/Makefile.am b/cmd/Makefile.am
index fbdeaee62..2fa281cad 100644
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@@ -1,23 +1,39 @@
-PHONY =
-include $(top_srcdir)/config/Shellcheck.am
-include $(top_srcdir)/config/CppCheck.am
+bin_SCRIPTS =
+bin_PROGRAMS =
+sbin_SCRIPTS =
+sbin_PROGRAMS =
+udev_PROGRAMS =
+dist_bin_SCRIPTS =
+zfsexec_PROGRAMS =
+dist_udev_SCRIPTS =
+mounthelper_PROGRAMS =
 
-SUBDIRS  = zfs zpool zdb zhack zinject zstream ztest
-SUBDIRS += fsck_zfs vdev_id raidz_test zfs_ids_to_path
-SUBDIRS += zpool_influxdb
+include $(srcdir)/%D%/fsck_zfs/Makefile.am
+include $(srcdir)/%D%/raidz_test/Makefile.am
+include $(srcdir)/%D%/vdev_id/Makefile.am
+include $(srcdir)/%D%/zdb/Makefile.am
+include $(srcdir)/%D%/zfs/Makefile.am
+include $(srcdir)/%D%/zfs_ids_to_path/Makefile.am
+include $(srcdir)/%D%/zhack/Makefile.am
+include $(srcdir)/%D%/zinject/Makefile.am
+include $(srcdir)/%D%/zpool/Makefile.am
+include $(srcdir)/%D%/zpool_influxdb/Makefile.am
+include $(srcdir)/%D%/zstream/Makefile.am
+include $(srcdir)/%D%/ztest/Makefile.am
 
-CPPCHECKDIRS += zfs zpool zdb zhack zinject zstream ztest
-CPPCHECKDIRS += raidz_test zfs_ids_to_path zpool_influxdb
-
-# TODO: #12084: SHELLCHECKDIRS += vdev_id
-SHELLCHECKDIRS = fsck_zfs zed zpool zvol_wait
+if BUILD_LINUX
+include $(srcdir)/%D%/mount_zfs/Makefile.am
+include $(srcdir)/%D%/zed/Makefile.am
+include $(srcdir)/%D%/zgenhostid/Makefile.am
+include $(srcdir)/%D%/zvol_id/Makefile.am
+include $(srcdir)/%D%/zvol_wait/Makefile.am
+endif
 
 if USING_PYTHON
-SUBDIRS += arcstat arc_summary dbufstat
+include $(srcdir)/%D%/arc_summary/Makefile.am
+include $(srcdir)/%D%/arcstat/Makefile.am
+include $(srcdir)/%D%/dbufstat/Makefile.am
 endif
 
-if BUILD_LINUX
-SUBDIRS += mount_zfs zed zgenhostid zvol_id zvol_wait
-CPPCHECKDIRS += mount_zfs zed zgenhostid zvol_id
-SHELLCHECKDIRS += zed
-endif
+PHONY += cmd
+cmd: $(bin_SCRIPTS) $(bin_PROGRAMS) $(sbin_SCRIPTS) $(sbin_PROGRAMS) $(udev_PROGRAMS) $(dist_bin_SCRIPTS) $(zfsexec_PROGRAMS) $(dist_udev_SCRIPTS) $(mounthelper_PROGRAMS)