[XEN PATCH 41/57] libs: Remove need for *installlocal targets

[Anthony PERARD <anthony.perard@xxxxxxxxxx>]

There is no need for an extra "installlocal" target, we can use
double-colon rules instead.

"install-headers" in "libs/store" was introduced for the same reason
that "installlocal" exist, so it is replaced as well.

Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
---
 tools/libs/libs.mk        |  4 ++--
 tools/libs/light/Makefile | 10 ++--------
 tools/libs/store/Makefile | 10 ++--------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk
index 91d4efeaed..7f2c676be4 100644
--- a/tools/libs/libs.mk
+++ b/tools/libs/libs.mk
@@ -97,7 +97,7 @@ endif
 endif
 
 .PHONY: install
-install: all
+install:: all
        $(INSTALL_DIR) $(DESTDIR)$(libdir)
        $(INSTALL_DIR) $(DESTDIR)$(includedir)
        $(INSTALL_SHLIB) lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(libdir)
@@ -108,7 +108,7 @@ install: all
        $(INSTALL_DATA) $(PKG_CONFIG) $(DESTDIR)$(PKG_INSTALLDIR)
 
 .PHONY: uninstall
-uninstall:
+uninstall::
        rm -f $(DESTDIR)$(PKG_INSTALLDIR)/$(LIB_FILE_NAME).pc
        for i in $(LIBHEADER); do rm -f $(DESTDIR)$(includedir)/$$i; done
        rm -f $(DESTDIR)$(libdir)/lib$(LIB_FILE_NAME).so
diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile
index 622fa04470..5e52db9b30 100644
--- a/tools/libs/light/Makefile
+++ b/tools/libs/light/Makefile
@@ -243,17 +243,11 @@ libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so
 testidl: testidl.o libxenlight.so
        $(CC) $(LDFLAGS) -o $@ testidl.o $(LDLIBS_libxenlight) 
$(LDLIBS_libxentoollog) $(LDLIBS_libxentoolcore) $(APPEND_LDFLAGS)
 
-install: installlocal $(LIBHEADERS)
-
-.PHONY: installlocal
-installlocal: libxl-save-helper
+install:: $(LIBHEADERS) libxl-save-helper
        $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
        $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN)
 
-uninstall: uninstalllocal
-
-.PHONY: uninstalllocal
-uninstalllocal:
+uninstall::
        rm -f $(DESTDIR)$(LIBEXEC_BIN)/libxl-save-helper
 
 clean: cleanlocal
diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile
index 457122a041..1bacee6cf1 100644
--- a/tools/libs/store/Makefile
+++ b/tools/libs/store/Makefile
@@ -32,10 +32,7 @@ endif
 -include $(DEPS_INCLUDE)
 
 .PHONY: install
-install: install-headers
-
-.PHONY: install-headers
-install-headers:
+install::
        $(INSTALL_DIR) $(DESTDIR)$(includedir)
        $(INSTALL_DIR) $(DESTDIR)$(includedir)/xenstore-compat
        $(INSTALL_DATA) $(XEN_INCLUDE)/xenstore-compat/xs.h 
$(DESTDIR)$(includedir)/xenstore-compat/xs.h
@@ -44,10 +41,7 @@ install-headers:
        ln -sf xenstore-compat/xs_lib.h $(DESTDIR)$(includedir)/xs_lib.h
 
 .PHONY: uninstall
-uninstall: uninstall-headers
-
-.PHONY: uninstall-headers
-uninstall-headers:
+uninstall::
        rm -f $(DESTDIR)$(includedir)/xs_lib.h
        rm -f $(DESTDIR)$(includedir)/xs.h
        rm -f $(DESTDIR)$(includedir)/xenstore-compat/xs_lib.h
-- 
Anthony PERARD