From 1b3ea6daaf0e8641571b357242e37fd8a1c33a71 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Fri, 11 Jan 2019 11:03:53 +0100 Subject: [PATCH] src: Don't use double-colon rules According to the GNU Make manual, "double-colon rules are somewhat obscure and not often very useful". Looking at the few instances we have in libvirt, that certainly seems to be the case, so just drop them. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- src/Makefile.am | 6 +++--- src/remote/Makefile.inc.am | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index cd386297ed..8c8dfe3dcf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -816,14 +816,14 @@ if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_RED_HAT initdir = $(sysconfdir)/rc.d/init.d -install-init:: $(SYSVINIT_FILES) install-sysconfig +install-init: $(SYSVINIT_FILES) install-sysconfig $(MKDIR_P) $(DESTDIR)$(initdir) for f in $(SYSVINIT_FILES:%.init=%) ; \ do \ $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \ done -uninstall-init:: uninstall-sysconfig +uninstall-init: uninstall-sysconfig rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(initdir)/%) rmdir $(DESTDIR)$(initdir) || : @@ -1010,7 +1010,7 @@ install-data-local: $(INSTALL_DATA_LOCAL) \ $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" -uninstall-local:: $(UNINSTALL_LOCAL) \ +uninstall-local: $(UNINSTALL_LOCAL) \ $(INSTALL_DATA_DIRS:%=uninstall-data-%) rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||: diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 0988435eed..3d0ff29548 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -213,7 +213,7 @@ polkitdir = $(datadir)/polkit-1 polkitactionsdir = $(polkitdir)/actions polkitrulesdir = $(polkitdir)/rules.d -install-polkit:: +install-polkit: $(MKDIR_P) $(DESTDIR)$(polkitactionsdir) $(INSTALL_DATA) $(srcdir)/remote/libvirtd.policy \ $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy @@ -221,7 +221,7 @@ install-polkit:: $(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \ $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules -uninstall-polkit:: +uninstall-polkit: rm -f $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy rmdir $(DESTDIR)$(polkitactionsdir) || : rm -f $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules -- GitLab