"libs" is odd and has been introduced without a reason by c7d3afbb44. Instead, only use "all".
Also remove "build" target as "all" is more appropriate and nothing is using "build" in libs/ in the xen.git repo. Signed-off-by: Anthony PERARD <[email protected]> --- tools/libs/libs.mk | 12 +++--------- tools/libs/light/Makefile | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 996d467346..7c5ae26bbd 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -53,13 +53,7 @@ $(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR = $(XEN_INCLUDE) $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR = $(CURDIR) .PHONY: all -all: build - -.PHONY: build -build: libs libxen$(LIBNAME).map $(LIBHEADERS) - -.PHONY: libs -libs: headers.chk $(LIB) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) +all: headers.chk $(LIB) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) libxen$(LIBNAME).map $(LIBHEADERS) ifneq ($(NO_HEADERS_CHK),y) headers.chk: @@ -96,14 +90,14 @@ lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxen$(LIBNAME).map # If abi-dumper is available, write out the ABI analysis ifneq ($(ABI_DUMPER),) ifneq ($(nosharedlibs),y) -libs: $(PKG_ABI) +all: $(PKG_ABI) $(PKG_ABI): lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) headers.lst $(ABI_DUMPER) $< -o $@ -public-headers headers.lst -lver $(MAJOR).$(MINOR) endif endif .PHONY: install -install: build +install: all $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_SHLIB) lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index fb5a9ca87e..be32d95d39 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -187,7 +187,7 @@ testidl.c: libxl_types.idl gentest.py $(XEN_INCLUDE)/libxl.h $(AUTOINCS) $(PYTHON) gentest.py libxl_types.idl testidl.c.new mv testidl.c.new testidl.c -build: $(CLIENTS) $(TEST_PROGS) $(AUTOSRCS) $(AUTOINCS) +all: $(CLIENTS) $(TEST_PROGS) $(AUTOSRCS) $(AUTOINCS) $(LIB_OBJS) $(PIC_OBJS) $(SAVE_HELPER_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): $(AUTOINCS) libxl.api-ok -- Anthony PERARD
