Make soname always libfoo.1 not libfoo.102312231.

Having the minor version change all the time makes sense.  Having the
soname change does not.

Signed-off-by: Peter Jones <pjones@redhat.com>

diff --git a/Make.rules b/Make.rules
index 2ea53c6..a7d6a23 100644 (file)
--- a/Make.rules
+++ b/Make.rules
@@ -18,7 +18,7 @@ include $(TOPDIR)/Make.version
 
 %.so :
        $(CCLD) $(ccldflags) $(CPPFLAGS) $(SOFLAGS) \
-         -Wl,-soname,$@.$(VERSION) \
+         -Wl,-soname,$@.1 \
          -Wl,--version-script=$(MAP) \
          -o $@ $^ $(LDLIBS)
 

diff --git a/src/Makefile b/src/Makefile
index 5216602..322af14 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -80,8 +80,10 @@ clean :
 install : all
        $(INSTALL) -d -m 755 $(DESTDIR)$(libdir)
        $(foreach x,$(LIBTARGETS), \
-               $(INSTALL) -m 755 $(x) $(DESTDIR)$(libdir)/$(x).$(VERSION) ;\
-               ln -fs $(x).$(VERSION) $(DESTDIR)$(libdir)/$(x); )
+               $(INSTALL) -m 755 $(x) $(DESTDIR)$(libdir)/$(x).1.$(VERSION) ;\
+               ln -fs $(x).1.$(VERSION) $(DESTDIR)$(libdir)/$(x).1 ;\
+               ln -fs $(x).1.$(VERSION) $(DESTDIR)$(libdir)/$(x) ;\
+               )
        $(INSTALL) -d -m 755 $(DESTDIR)$(PCDIR)
        $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(PCDIR) ;)
        $(INSTALL) -d -m 755 $(DESTDIR)$(includedir)/efivar
@@ -93,8 +95,8 @@ test : all
        $(MAKE) -C test $@
 
 .PHONY: test deps
-.SECONDARY : libefivar.so.$(VERSION)
-.SECONDARY : libefiboot.so.$(VERSION)
+.SECONDARY : libefivar.so.1.$(VERSION) libefivar.so.1
+.SECONDARY : libefiboot.so.1.$(VERSION) libefivar.so.1
 .SECONDARY : include/efivar/efivar-guids.h guid-symbols.c
 .INTERMEDIATE : guids.bin names.bin
 .PRECIOUS : guid-symbols.o makeguids

diff --git a/src/libefiboot.map.in b/src/libefiboot.map.in
index d3eceb1..51822a5 100644 (file)
--- a/src/libefiboot.map.in
+++ b/src/libefiboot.map.in
@@ -25,5 +25,5 @@ LIBEFIBOOT_0.0 {
 LIBEFIBOOT_0.24 {
 };
 
-LIBEFIBOOT_@@VERSION@@ {
+LIBEFIBOOT_1.@@VERSION@@ {
 };

diff --git a/src/libefivar.map.in b/src/libefivar.map.in
index 145eb75..6b8f996 100644 (file)
--- a/src/libefivar.map.in
+++ b/src/libefivar.map.in
@@ -99,7 +99,7 @@ LIBEFIVAR_0.24 {
                efi_guid_cmp;
 } LIBEFIVAR_0.0;
 
-LIBEFIVAR_@@VERSION@@ {
+LIBEFIVAR_1.@@VERSION@@ {
        global: efi_error_set;
                efi_error_get;
                efi_error_clear;