[beast/win32: 14/44] Build fixes: link to birnet/sfi libs with the .la file instead of .o file.

[Stefan Westerfeld <stw src gnome org>]

commit 48d01f69df76d4f9e253cb26118a00eecbb0ca68
Author: Stefan Westerfeld <stefan space twc de>
Date:   Tue Sep 1 19:34:43 2009 +0200

    Build fixes: link to birnet/sfi libs with the .la file instead of .o file.

 bse/Makefile.am       |    6 +++---
 sfi/Makefile.am       |   10 +++-------
 sfi/tests/Makefile.am |    4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 373c400..0f14559 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -10,7 +10,7 @@ SUBDIRS = icons zintern . tests
 # need -I$(top_builddir) for <sfi/sficonfig.h>
 # need -I$(srcdir) for "bseserver.h" in .genprc.c
 # need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
+INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS $(CFLAGS)
 DEFS     += $(strip \
 	$(patsubst %, -DG_LOG_DOMAIN=\"BSE\" -DBSE_COMPILATION, \
 	              $(filter $(<F), $(bse_sources) $(bse_sources))) \
@@ -139,7 +139,7 @@ libbseincludedir       	     = $(includedir)/bse
 libbseinclude_HEADERS        = $(bse_public_headers) bse.idl $(bse_idl_sources) bsehack.idl $(idl_dummy_files)
 nodist_libbseinclude_HEADERS = bsecore.genidl.hh
 libbse_la_SOURCES            = $(bse_sources) $(bse_proc_gen_sources)
-libbse_la_LIBADD             = $(top_builddir)/birnet/libbirnet.o $(top_builddir)/sfi/libsfi.o $(BSE_LIBS) $(SFI_LIBS)
+libbse_la_LIBADD             = $(top_builddir)/birnet/libbirnet.la $(top_builddir)/sfi/libsfi.la $(BSE_LIBS) $(SFI_LIBS)
 libbse_la_LDFLAGS            = $(strip				\
 	-Wl,--version-script=$(srcdir)/ldscript.map		\
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
@@ -163,7 +163,7 @@ SFIDL_INC = --nostdinc -I$(top_srcdir) -I$(top_builddir)
 # rules to generate built sources
 #
 %.genprc.c: @PERLRULE@ %.proc mkcproc.pl
-	$(srcdir)/mkcproc.pl --funcname $@ --preprocess $< >$@
+	$(PERL) $(srcdir)/mkcproc.pl --funcname $@ --preprocess $< >$@
 CLEANSTAMPFILES = 
 if WITH_PERLRULE
 CLEANFILES += $(bse_proc_gen_sources) $(CLEANSTAMPFILES)
diff --git a/sfi/Makefile.am b/sfi/Makefile.am
index 8172d1e..99dd408 100644
--- a/sfi/Makefile.am
+++ b/sfi/Makefile.am
@@ -39,16 +39,12 @@ $(sfi_all_sources): $(sfi_built_sources)
 # 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
+lib_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
+libsfi_la_LIBADD      = $(top_builddir)/birnet/libbirnet.la $(SFI_LIBS) -lm
 CLEANFILES += libsfi.o libsfi.lo
 
 #
@@ -61,7 +57,7 @@ common_idl_sources = sfidl-generator.cc sfidl-namespace.cc sfidl-options.cc sfid
 
 bin_PROGRAMS = sfidl
 sfidl_SOURCES = sfidl.cc $(common_idl_sources)
-sfidl_LDADD = $(SFI_LIBS) -lm $(top_builddir)/birnet/libbirnet.o # libsfi.la
+sfidl_LDADD = $(SFI_LIBS) -lm $(top_builddir)/birnet/libbirnet.la # libsfi.la
 sfidl_CFLAGS = $(AM_CFLAGS) # hack to cause glib-extra.c to be compiled twice (work around automake)
 EXTRA_DIST += sfidl-generator.hh sfidl-namespace.hh sfidl-options.hh sfidl-parser.hh sfidl-factory.hh
 EXTRA_DIST += sfidl-cbase.hh sfidl-clientc.hh sfidl-clientcxx.hh sfidl-cxxbase.hh sfidl-hostc.hh sfidl-utils.hh
diff --git a/sfi/tests/Makefile.am b/sfi/tests/Makefile.am
index a2fd5e6..9886957 100644
--- a/sfi/tests/Makefile.am
+++ b/sfi/tests/Makefile.am
@@ -8,8 +8,8 @@ INCLUDES       += -I$(top_srcdir) -I$(top_builddir) -I. $(SFI_CFLAGS)
 DEFS	       += -DG_LOG_DOMAIN='"$(basename $(@F))"' -DPARANOID # -DG_DISABLE_CONST_RETURNS
 
 noinst_PROGRAMS   = $(ALLTESTS)
-progs_nosfi_ldadd = $(top_builddir)/birnet/libbirnet.o $(SFI_LIBS) -lm
-progs_ldadd 	  = $(top_builddir)/birnet/libbirnet.o $(top_builddir)/sfi/libsfi.o $(SFI_LIBS) -lm
+progs_nosfi_ldadd = $(top_builddir)/birnet/libbirnet.la $(SFI_LIBS) -lm
+progs_ldadd 	  = $(top_builddir)/birnet/libbirnet.la $(top_builddir)/sfi/libsfi.la $(SFI_LIBS) -lm
 SFIDL 		  = $(top_builddir)/sfi/sfidl
 
 # ring