Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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
This commit is contained in:
Ryan Moeller 2019-08-26 14:48:31 -04:00 committed by Brian Behlendorf
parent 95f0144675
commit 142f84dd19
12 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -44,7 +44,8 @@ gitrev:
BUILT_SOURCES = gitrev BUILT_SOURCES = gitrev
distclean-local: # Double-colon rules are allowed; there are multiple independent definitions.
distclean-local::
-$(RM) -R autom4te*.cache -$(RM) -R autom4te*.cache
-find . \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \ -find . \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \
-o -name .pc -o -name .hg -o -name .git \) -prune -o \ -o -name .pc -o -name .hg -o -name .git \) -prune -o \

2
contrib/dracut/02zfsexpandknowledge/Makefile.am
View File

@ -15,8 +15,10 @@ $(pkgdracut_SCRIPTS):%:%.in
-e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \
$< >'$@' $< >'$@'
# Double-colon rules are allowed; there are multiple independent definitions.
clean-local:: clean-local::
-$(RM) $(pkgdracut_SCRIPTS) -$(RM) $(pkgdracut_SCRIPTS)
# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local:: distclean-local::
-$(RM) $(pkgdracut_SCRIPTS) -$(RM) $(pkgdracut_SCRIPTS)

1
contrib/dracut/90zfs/Makefile.am
View File

@ -33,5 +33,6 @@ $(pkgdracut_SCRIPTS) $(pkgdracut_DATA) :%:%.in
-e 's,@mounthelperdir\@,$(mounthelperdir),g' \ -e 's,@mounthelperdir\@,$(mounthelperdir),g' \
$< >'$@' $< >'$@'
# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local:: distclean-local::
-$(RM) $(pkgdracut_SCRIPTS) $(pkgdracut_DATA) -$(RM) $(pkgdracut_SCRIPTS) $(pkgdracut_DATA)

2
contrib/initramfs/hooks/Makefile.am
View File

@ -14,8 +14,10 @@ $(hooks_SCRIPTS):%:%.in
-e 's,@mounthelperdir\@,$(mounthelperdir),g' \ -e 's,@mounthelperdir\@,$(mounthelperdir),g' \
$< >'$@' $< >'$@'
# Double-colon rules are allowed; there are multiple independent definitions.
clean-local:: clean-local::
-$(RM) $(hooks_SCRIPTS) -$(RM) $(hooks_SCRIPTS)
# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local:: distclean-local::
-$(RM) $(hooks_SCRIPTS) -$(RM) $(hooks_SCRIPTS)

2
contrib/initramfs/scripts/Makefile.am
View File

@ -13,8 +13,10 @@ $(scripts_DATA):%:%.in
-e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \
$< >'$@' $< >'$@'
# Double-colon rules are allowed; there are multiple independent definitions.
clean-local:: clean-local::
-$(RM) $(scripts_SCRIPTS) -$(RM) $(scripts_SCRIPTS)
# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local:: distclean-local::
-$(RM) $(scripts_SCRIPTS) -$(RM) $(scripts_SCRIPTS)

1
etc/init.d/Makefile.am
View File

@ -40,5 +40,6 @@ $(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS):%:%.in
[ '$@' = 'zfs-functions' -o '$@' = 'zfs' ] || \ [ '$@' = 'zfs-functions' -o '$@' = 'zfs' ] || \
chmod +x '$@') chmod +x '$@')
# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local:: distclean-local::
-$(RM) $(init_SCRIPTS) $(initcommon_SCRIPTS) $(initconf_SCRIPTS) -$(RM) $(init_SCRIPTS) $(initcommon_SCRIPTS) $(initconf_SCRIPTS)

1
etc/modules-load.d/Makefile.am
View File

@ -9,5 +9,6 @@ $(modulesload_DATA):%:%.in
-e '' \ -e '' \
$< >'$@' $< >'$@'
# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local:: distclean-local::
-$(RM) $(modulesload_DATA) -$(RM) $(modulesload_DATA)

1
etc/systemd/system-generators/Makefile.am
View File

@ -11,5 +11,6 @@ $(systemdgenerator_SCRIPTS): %: %.in
-e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \
$< >'$@' $< >'$@'
# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local:: distclean-local::
-$(RM) $(systemdgenerator_SCRIPTS) -$(RM) $(systemdgenerator_SCRIPTS)

1
etc/systemd/system/Makefile.am
View File

@ -35,5 +35,6 @@ install-data-hook:
$(MKDIR_P) "$(DESTDIR)$(systemdunitdir)" $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)"
ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-import.service" ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-import.service"
# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local:: distclean-local::
-$(RM) $(systemdunit_DATA) $(systemdpreset_DATA) -$(RM) $(systemdunit_DATA) $(systemdpreset_DATA)

1
tests/zfs-tests/include/Makefile.am
View File

@ -16,5 +16,6 @@ $(nodist_pkgdata_DATA): %: %.in
-e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \
$< >'$@' $< >'$@'
# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local:: distclean-local::
-$(RM) default.cfg -$(RM) default.cfg

1
tests/zfs-tests/tests/functional/pyzfs/Makefile.am
View File

@ -14,5 +14,6 @@ $(pkgpyzfs_SCRIPTS):%:%.in
$< >'$@' $< >'$@'
-chmod 775 $@ -chmod 775 $@
# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local:: distclean-local::
-$(RM) $(pkgpyzfs_SCRIPTS) -$(RM) $(pkgpyzfs_SCRIPTS)

1
udev/rules.d/Makefile.am
View File

@ -16,5 +16,6 @@ $(udevrule_DATA):%:%.in
-e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \
$< > '$@' $< > '$@'
# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local:: distclean-local::
-$(RM) $(udevrule_DATA) -$(RM) $(udevrule_DATA)