]> xenbits.xensource.com Git - libvirt.git/commitdiff
src: Don't use double-colon rules
authorAndrea Bolognani <abologna@redhat.com>
Fri, 11 Jan 2019 10:03:53 +0000 (11:03 +0100)
committerAndrea Bolognani <abologna@redhat.com>
Wed, 16 Jan 2019 09:19:48 +0000 (10:19 +0100)
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 <abologna@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
src/Makefile.am
src/remote/Makefile.inc.am

index cd386297ed2a95e0eb5bc861839f19d129ee2fc3..8c8dfe3dcf938c0217f5e7812a7bee683b59c33c 100644 (file)
@@ -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" ||:
index 0988435eed944afcaa5a0505db234537aa183500..3d0ff2954821ac8e54fc4da419bd3dd70cf32ab2 100644 (file)
@@ -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