[beast/rc1: 1/4] SFI: remove outdated automake workaround and use libsfi.la as partial .so

[Tim Janik <timj src gnome org>]

commit c9409b46aba4a3e42de0c075da0cc7e9e73e4003
Author: Tim Janik <timj gnu org>
Date:   Wed Oct 15 02:55:13 2014 +0200

    SFI: remove outdated automake workaround and use libsfi.la as partial .so

 beast-gtk/gxk/Makefile.am |    2 +-
 bse/Makefile.am           |    2 +-
 sfi/Makefile.am           |    9 ---------
 sfi/tests/Makefile.am     |    2 +-
 4 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/beast-gtk/gxk/Makefile.am b/beast-gtk/gxk/Makefile.am
index 6193624..6697303 100644
--- a/beast-gtk/gxk/Makefile.am
+++ b/beast-gtk/gxk/Makefile.am
@@ -113,7 +113,7 @@ libgxk_a_SOURCES = $(gxk_c_sources)
 noinst_PROGRAMS = $(ALLTESTS)
 progs_LDADD     = $(strip                                      \
        libgxk.a $(GXK_LIBS)                                    \
-       $(top_builddir)/sfi/libsfi.o $(SFI_LIBS)                \
+       $(top_builddir)/sfi/libsfi.la $(SFI_LIBS)               \
        $(RAPICORN_LIBS) $(BIRNET_LIBS)                         \
 )
 
diff --git a/bse/Makefile.am b/bse/Makefile.am
index b59e661..c9fc9a1 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -143,7 +143,7 @@ libbseincludedir                 = $(includedir)/bse
 libbseinclude_HEADERS        = $(bse_public_headers) bse.idl $(bse_idl_sources) bsehack.idl 
$(idl_dummy_files)
 nodist_libbseinclude_HEADERS = bsebasics.genidl.hh
 libbse_la_SOURCES            = $(bse_sources) $(bse_proc_gen_sources)
-libbse_la_LIBADD             = $(top_builddir)/sfi/libsfi.o $(BSE_LIBS) $(SFI_LIBS) $(RAPICORN_LIBS)
+libbse_la_LIBADD             = $(top_builddir)/sfi/libsfi.la $(BSE_LIBS) $(SFI_LIBS) $(RAPICORN_LIBS)
 libbse_la_LDFLAGS            = $(strip                         \
        -Wl,--version-script=$(srcdir)/ldscript.map             \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
diff --git a/sfi/Makefile.am b/sfi/Makefile.am
index f13263b..1a87a91 100644
--- a/sfi/Makefile.am
+++ b/sfi/Makefile.am
@@ -33,21 +33,12 @@ sfi_built_sources = $(strip \
 $(sfi_all_sources): $(sfi_built_sources)
 
 # SFI library
-# we want a partial shared library here. libtool creates that if the library
-# name ends in .lo or .o. however automake doesn't know .lo or .o libraries,
-# so we simply build an ordinary non-installed .la library and then use our
-# own rule to build the .o from the .la pieces.
 noinst_LTLIBRARIES    = libsfi.la
 libsfiincludedir      = $(includedir)/sfi
 libsfiinclude_HEADERS = $(sfi_public_headers)
 libsfi_la_SOURCES     = $(sfi_all_sources)
 libsfi_la_LDFLAGS     = -no-undefined # -Wl,-Bsymbolic
 libsfi_la_LIBADD      = $(SFI_LIBS) -lm
-# keep this .o rule in sync with the corresponding .la rule from Makefile.in
-libsfi.o: $(libsfi_la_OBJECTS) $(libsfi_la_DEPENDENCIES)
-       $(CXXLINK)  $(libsfi_la_LDFLAGS) $(libsfi_la_OBJECTS) # $(libsfi_la_LIBADD) $(LIBS)
-all-am: libsfi.o
-CLEANFILES += libsfi.o libsfi.lo
 
 #
 # programs to build
diff --git a/sfi/tests/Makefile.am b/sfi/tests/Makefile.am
index 53311f3..1b0eafb 100644
--- a/sfi/tests/Makefile.am
+++ b/sfi/tests/Makefile.am
@@ -8,7 +8,7 @@ AM_CXXFLAGS  = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 noinst_PROGRAMS   = $(ALLTESTS)
 progs_nosfi_ldadd = $(RAPICORN_LIBS) $(SFI_LIBS) -lm
-progs_ldadd      = $(top_builddir)/sfi/libsfi.o $(RAPICORN_LIBS) $(SFI_LIBS) -lm
+progs_ldadd      = $(top_builddir)/sfi/libsfi.la $(RAPICORN_LIBS) $(SFI_LIBS) -lm
 SFIDL            = $(top_builddir)/sfi/sfidl
 
 # ring