al'ight, now we have the symlinks done \o/

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/am/footer.mk b/am/footer.mk
index 90a1f9a..25fae74 100644 (file)
--- a/am/footer.mk
+++ b/am/footer.mk
@@ -61,14 +61,16 @@ install-LIBRARIES/%::
        $(if $($*dir),$(INSTALL_DATA) $($*_LIBRARIES:=.so*) $(DESTDIR)$($*dir))
 
 define CLASS_LIBRARIES_tpl
-  all:: $1.so$$(if $$($1_VERSION),.$$($1_VERSION))
-  install-LIBRARIES/$2:: $1.so$$(if $$($1_VERSION),.$$($1_VERSION))
+  all:: $1.so$3
+  install-LIBRARIES/$2:: $1.so$3
 
   install:: install-LIBRARIES/$2
 
-  $1.so$$(if $$($1_VERSION),.$$($1_VERSION)): $$(call deps_create,$$($1_SOURCES),$(_cobjs)/$1)
+  $1.so$3: $$(call deps_create,$$($1_SOURCES),$(_cobjs)/$1)
        $(CC) $$(CFLAGS) $$($1_CPPFLAGS) -fPIC -shared -o $$@ $$(filter %.o,$$^) \
                $$(LDFLAGS) $$($1_LDFLAGS) $$($1_LIBADD)
+       $$(if $$(word 2,$$(subst ., ,$3)),ln -sf $$@ $1.so.$$(word 1,$$(subst ., ,$3)))
+       $$(if $$($1_VERSION), ln -sf $$@ $1.so)
 
   $$(eval $$(call RULE_C_tpl,$1,-fPIC))
 
@@ -76,7 +78,8 @@ define CLASS_LIBRARIES_tpl
            $(RM) $1.so*
 endef
 $(foreach v,$(filter %_LIBRARIES,$(.VARIABLES)), \
-            $(foreach x,$($v),$(eval $(call CLASS_LIBRARIES_tpl,$x,$(v:_LIBRARIES=)))))
+            $(foreach x,$($v),$(eval $(call CLASS_LIBRARIES_tpl,$x,$(v:_LIBRARIES=),$(...\
+           ...)$(if $($x_VERSION),.$($x_VERSION))))))
 
 
 ##

diff --git a/madtty/Makefile.in b/madtty/Makefile.in
index 192da9a..bb58d1d 100644 (file)
--- a/madtty/Makefile.in
+++ b/madtty/Makefile.in
@@ -7,11 +7,9 @@ pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = madtty.pc
 
 lib_LIBRARIES = libmadtty
-libmadtty_SOURCES = inject.c inject_csi.c inject_csi.h madtty.h rote.c rote_keymap.c roteprivate.h
-libmadtty_CPPFLAGS= -Wno-error
-libmadtty_LDFLAGS = -Wl,-soname=libmadtty.so.0
-libmadtty_LIBADD  =
-libmadtty_VERSION = @PACKAGE_VERSION@
+libmadtty_SOURCES  = inject.c inject_csi.c inject_csi.h madtty.h rote.c rote_keymap.c roteprivate.h
+libmadtty_CPPFLAGS = -Wno-error
+libmadtty_VERSION  = @PACKAGE_VERSION@
 
 include $(DEPTH)/am/footer.mk