Restore :: in Makefile.am

The double-colon looked like a typo, but it's actually an obscure
feature. Rules with :: may appear multiple times and are run
independently of one another in the order they appear. The use of ::
for distclean-local was conventional, not accidental.

Add comments to indicate the intentional use of double-colon rules.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@ixsystems.com>
Closes #9210

diff --git a/Makefile.am b/Makefile.am
index da4f6407d18b81fce03d11cf116865c9cc453232..3992fe9adb22b494e72c5a5489da64a49d0c0827 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,8 @@ gitrev:
 
 BUILT_SOURCES = gitrev
 
-distclean-local:
+# Double-colon rules are allowed; there are multiple independent definitions.
+distclean-local::
        -$(RM) -R autom4te*.cache
        -find . \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \
                -o -name .pc -o -name .hg -o -name .git \) -prune -o \

diff --git a/contrib/dracut/02zfsexpandknowledge/Makefile.am b/contrib/dracut/02zfsexpandknowledge/Makefile.am
index a5c567c161c85789f03a9ae2de234a835c86d2e0..6e553e8d456f4a3784493b5cb0fb0114b17e89f8 100644 (file)
--- a/contrib/dracut/02zfsexpandknowledge/Makefile.am
+++ b/contrib/dracut/02zfsexpandknowledge/Makefile.am
@@ -15,8 +15,10 @@ $(pkgdracut_SCRIPTS):%:%.in
                -e 's,@sysconfdir\@,$(sysconfdir),g' \
                $< >'$@'
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 clean-local::
        -$(RM) $(pkgdracut_SCRIPTS)
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 distclean-local::
        -$(RM) $(pkgdracut_SCRIPTS)

diff --git a/contrib/dracut/90zfs/Makefile.am b/contrib/dracut/90zfs/Makefile.am
index 0a557f57f2568212b68faff26e0ddfc77d250ac7..1680230fa34ea2ba2eec41911b3dfcb7b0671850 100644 (file)
--- a/contrib/dracut/90zfs/Makefile.am
+++ b/contrib/dracut/90zfs/Makefile.am
@@ -33,5 +33,6 @@ $(pkgdracut_SCRIPTS) $(pkgdracut_DATA) :%:%.in
                -e 's,@mounthelperdir\@,$(mounthelperdir),g' \
                $< >'$@'
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 distclean-local::
        -$(RM) $(pkgdracut_SCRIPTS) $(pkgdracut_DATA)

diff --git a/contrib/initramfs/hooks/Makefile.am b/contrib/initramfs/hooks/Makefile.am
index 1735872c29b7ff3c3a6802f88e9d0157ee2413ec..3d8ef627ed47560ece63b506b1ae3d3eb8449586 100644 (file)
--- a/contrib/initramfs/hooks/Makefile.am
+++ b/contrib/initramfs/hooks/Makefile.am
@@ -14,8 +14,10 @@ $(hooks_SCRIPTS):%:%.in
                -e 's,@mounthelperdir\@,$(mounthelperdir),g' \
                $< >'$@'
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 clean-local::
        -$(RM) $(hooks_SCRIPTS)
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 distclean-local::
        -$(RM) $(hooks_SCRIPTS)

diff --git a/contrib/initramfs/scripts/Makefile.am b/contrib/initramfs/scripts/Makefile.am
index 12c2641b80cce465af338acecce9112bee638365..3ab18ba2cbce485d9decfe699defedda4d413b5f 100644 (file)
--- a/contrib/initramfs/scripts/Makefile.am
+++ b/contrib/initramfs/scripts/Makefile.am
@@ -13,8 +13,10 @@ $(scripts_DATA):%:%.in
                -e 's,@sysconfdir\@,$(sysconfdir),g' \
                $< >'$@'
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 clean-local::
        -$(RM) $(scripts_SCRIPTS)
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 distclean-local::
        -$(RM) $(scripts_SCRIPTS)

diff --git a/etc/init.d/Makefile.am b/etc/init.d/Makefile.am
index 93432386a2c425e7230663b0cf95548699450077..8b1a7cf9629b466593759e4473f96c83beb39e83 100644 (file)
--- a/etc/init.d/Makefile.am
+++ b/etc/init.d/Makefile.am
@@ -40,5 +40,6 @@ $(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS):%:%.in
          [ '$@' = 'zfs-functions' -o '$@' = 'zfs' ] || \
                chmod +x '$@')
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 distclean-local::
        -$(RM) $(init_SCRIPTS) $(initcommon_SCRIPTS) $(initconf_SCRIPTS)

diff --git a/etc/modules-load.d/Makefile.am b/etc/modules-load.d/Makefile.am
index 58c7acd44e7ca8be0a7651dc755290db393e1073..47762b7d06576c72ba3a6a276f10ab889ec3f941 100644 (file)
--- a/etc/modules-load.d/Makefile.am
+++ b/etc/modules-load.d/Makefile.am
@@ -9,5 +9,6 @@ $(modulesload_DATA):%:%.in
                -e '' \
                $< >'$@'
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 distclean-local::
        -$(RM) $(modulesload_DATA)

diff --git a/etc/systemd/system-generators/Makefile.am b/etc/systemd/system-generators/Makefile.am
index c730982a515243d4db2ccd7127d59f035d79f19c..b4df013222117409375d627b4fcc96174caf2dab 100644 (file)
--- a/etc/systemd/system-generators/Makefile.am
+++ b/etc/systemd/system-generators/Makefile.am
@@ -11,5 +11,6 @@ $(systemdgenerator_SCRIPTS): %: %.in
                -e 's,@sysconfdir\@,$(sysconfdir),g' \
                $< >'$@'
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 distclean-local::
        -$(RM) $(systemdgenerator_SCRIPTS)

diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
index 130c6c757a594d7714c10b37cb05e6c8aeb2d0c7..4e14467a044f0647c70e7075bcc0f1bc10ce3571 100644 (file)
--- a/etc/systemd/system/Makefile.am
+++ b/etc/systemd/system/Makefile.am
@@ -35,5 +35,6 @@ install-data-hook:
        $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)"
        ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-import.service"
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 distclean-local::
        -$(RM) $(systemdunit_DATA) $(systemdpreset_DATA)

diff --git a/tests/zfs-tests/include/Makefile.am b/tests/zfs-tests/include/Makefile.am
index 41e105287b48543471ac2ee813e280bd517f7f57..86c387c677d7d5261b7cba3cdffe470620d0cfa8 100644 (file)
--- a/tests/zfs-tests/include/Makefile.am
+++ b/tests/zfs-tests/include/Makefile.am
@@ -16,5 +16,6 @@ $(nodist_pkgdata_DATA): %: %.in
                -e 's,@sysconfdir\@,$(sysconfdir),g' \
                $< >'$@'
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 distclean-local::
        -$(RM) default.cfg

diff --git a/tests/zfs-tests/tests/functional/pyzfs/Makefile.am b/tests/zfs-tests/tests/functional/pyzfs/Makefile.am
index 0a27adeccaf48ba39b2d7239fc6f0522577aa9ce..c4cd10894c3cf6ecf59f51dfbcc4a9369846ea5b 100644 (file)
--- a/tests/zfs-tests/tests/functional/pyzfs/Makefile.am
+++ b/tests/zfs-tests/tests/functional/pyzfs/Makefile.am
@@ -14,5 +14,6 @@ $(pkgpyzfs_SCRIPTS):%:%.in
                $< >'$@'
        -chmod 775 $@
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 distclean-local::
        -$(RM) $(pkgpyzfs_SCRIPTS)

diff --git a/udev/rules.d/Makefile.am b/udev/rules.d/Makefile.am
index f79ea4b3c3e4619ca8389c0ca2ac3825097d4e87..86c33fc697cc2cba046b40685fe39f735d236aff 100644 (file)
--- a/udev/rules.d/Makefile.am
+++ b/udev/rules.d/Makefile.am
@@ -16,5 +16,6 @@ $(udevrule_DATA):%:%.in
                -e 's,@sysconfdir\@,$(sysconfdir),g' \
                $< > '$@'
 
+# Double-colon rules are allowed; there are multiple independent definitions.
 distclean-local::
        -$(RM) $(udevrule_DATA)