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@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
This commit is contained in:
Anthony PERARD authored and Julien Grall committed 2022-06-16 16:58:50 +01:00
1 parent 128b7e6448
commit b978a348eb
4 files changed
+10 -22

No files matched your search

+2 -2
View File
@@ -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
+2 -8
View File
@@ -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
+4 -4
View File
@@ -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
+2 -8
View File
@@ -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
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.