From eea1b03e2df139d1927341a33fc83a0be5d4a195 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 5 Jul 2014 11:46:47 +0200 Subject: [PATCH] tools-libfsimage-abiname.diff Patch-Name: tools-libfsimage-abiname.diff Gbp-Pq: Topic prefix-abiname Gbp-Pq: Name tools-libfsimage-abiname.diff --- tools/libfsimage/common/Makefile | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile index a4655c421c..b3881de9e9 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -1,9 +1,6 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/libfsimage/Rules.mk -MAJOR = 1.0 -MINOR = 0 - LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU LDFLAGS += $(LDFLAGS-y) @@ -15,7 +12,7 @@ LIB_SRCS-y = fsimage.c fsimage_plugin.c fsimage_grub.c PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) -LIB = libfsimage.so libfsimage.so.$(MAJOR) libfsimage.so.$(MAJOR).$(MINOR) +LIB = libfsimage.so .PHONY: all all: $(LIB) @@ -24,9 +21,7 @@ all: $(LIB) install: all $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) - $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) - ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libfsimage.so.$(MAJOR) - ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(libdir)/libfsimage.so + $(INSTALL_PROG) libfsimage.so $(DESTDIR)$(libdir) $(INSTALL_DATA) fsimage.h $(DESTDIR)$(includedir) $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(includedir) $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(includedir) @@ -37,19 +32,12 @@ uninstall: rm -f $(DESTDIR)$(includedir)/fsimage_plugin.h rm -f $(DESTDIR)$(includedir)/fsimage.h rm -f $(DESTDIR)$(libdir)/libfsimage.so - rm -f $(DESTDIR)$(libdir)/libfsimage.so.$(MAJOR) - rm -f $(DESTDIR)$(libdir)/libfsimage.so.$(MAJOR).$(MINOR) clean distclean:: rm -f $(LIB) -libfsimage.so: libfsimage.so.$(MAJOR) - ln -sf $< $@ -libfsimage.so.$(MAJOR): libfsimage.so.$(MAJOR).$(MINOR) - ln -sf $< $@ - -libfsimage.so.$(MAJOR).$(MINOR): $(PIC_OBJS) - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) $(APPEND_LDFLAGS) +libfsimage.so: $(PIC_OBJS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) $(APPEND_LDFLAGS) -include $(DEPS_INCLUDE) -- 2.30.2