[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] libs: Remove need for *installlocal targets
commit b978a348eb8c47109ad98319fbd3cd4415d65fe8 Author: Anthony PERARD <anthony.perard@xxxxxxxxxx> AuthorDate: Fri Feb 25 15:13:07 2022 +0000 Commit: Julien Grall <jgrall@xxxxxxxxxx> CommitDate: Thu Jun 16 16:58:50 2022 +0100 libs: Remove need for *installlocal targets 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> Reviewed-by: Juergen Gross <jgross@xxxxxxxx> --- tools/libs/libs.mk | 4 ++-- tools/libs/light/Makefile | 10 ++-------- tools/libs/stat/Makefile | 8 ++++---- tools/libs/store/Makefile | 10 ++-------- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 3118cb4194..a173f59a8b 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -100,7 +100,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) @@ -111,7 +111,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 7c0a5dca85..769e2a83e2 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -239,17 +239,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/stat/Makefile b/tools/libs/stat/Makefile index 6cd0af5239..1aef25a9bb 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -78,8 +78,8 @@ uninstall-python-bindings: ifeq ($(XENSTAT_PYTHON_BINDINGS),y) .PHONY: all all: python-bindings -install: install-python-bindings -uninstall: uninstall-python-bindings +install:: install-python-bindings +uninstall:: uninstall-python-bindings endif # Perl bindings @@ -111,8 +111,8 @@ ifeq ($(XENSTAT_PERL_BINDINGS),y) all: perl-bindings .PHONY: install -install: install-perl-bindings -uninstall: uninstall-perl-bindings +install:: install-perl-bindings +uninstall:: uninstall-perl-bindings endif clean: cleanlocal diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile index 18ae1fe94d..b94060be8d 100644 --- a/tools/libs/store/Makefile +++ b/tools/libs/store/Makefile @@ -30,10 +30,7 @@ xs.opic: CFLAGS += -DUSE_DLSYM endif .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 @@ -42,10 +39,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 -- generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |