[beast/win32] Add CFLAGS everywhere to allow non-standard-prefix libs; Use .la instead

[Stefan Westerfeld <stw src gnome org>]

commit 97654b0976d672afc800097d63cadbdb7dc1468f
Author: Stefan Westerfeld <stefan space twc de>
Date:   Fri Sep 4 19:08:58 2009 +0200

    Add CFLAGS everywhere to allow non-standard-prefix libs; Use .la instead
    of non-portable .o for libbirnet / libsfi.
    
    Based on 009_inline_lib_make.diff.

 beast-gtk/gxk/Makefile.am |    4 ++--
 tests/Makefile.am         |    2 +-
 tests/bse/Makefile.am     |    2 +-
 tests/latency/Makefile.am |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/beast-gtk/gxk/Makefile.am b/beast-gtk/gxk/Makefile.am
index 854a35b..6b9ac4d 100644
--- a/beast-gtk/gxk/Makefile.am
+++ b/beast-gtk/gxk/Makefile.am
@@ -120,8 +120,8 @@ 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)/birnet/libbirnet.o $(BIRNET_LIBS)	\
+	$(top_builddir)/sfi/libsfi.la $(SFI_LIBS) 		\
+	$(top_builddir)/birnet/libbirnet.la $(BIRNET_LIBS)	\
 )
 
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0779aa6..f38fc31 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = . latency scripts bse audio filecheck
 
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(SFI_CFLAGS)
+INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(SFI_CFLAGS) $(CFLAGS)
 DEFS += -DG_LOG_DOMAIN="\"BEAST-TEST\"" # -DG_DISABLE_CONST_RETURNS
 SFIDL = $(top_builddir)/sfi/sfidl
 SFIDL_INC = --nostdinc -I$(top_srcdir) -I$(top_builddir)
diff --git a/tests/bse/Makefile.am b/tests/bse/Makefile.am
index 90d9428..21e6487 100644
--- a/tests/bse/Makefile.am
+++ b/tests/bse/Makefile.am
@@ -5,7 +5,7 @@
 ## GNU Lesser General Public License version 2 or any later version.
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(SFI_CFLAGS)
+INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(SFI_CFLAGS) $(CFLAGS)
 DEFS     += -DG_LOG_DOMAIN="\"BSE-TEST\"" # -DG_DISABLE_CONST_RETURNS
 SFIDL = $(top_builddir)/sfi/sfidl
 SFIDL_INC = --nostdinc -I$(top_srcdir) -I$(top_builddir)
diff --git a/tests/latency/Makefile.am b/tests/latency/Makefile.am
index 547471a..3aa17f1 100644
--- a/tests/latency/Makefile.am
+++ b/tests/latency/Makefile.am
@@ -4,7 +4,7 @@
 ## GNU Lesser General Public License version 2 or any later version.
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(SFI_CFLAGS)
+INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(SFI_CFLAGS) $(CFLAGS)
 DEFS     += -DG_LOG_DOMAIN="\"BSE-TEST\"" # -DG_DISABLE_CONST_RETURNS
 # IDL Compiler
 SFIDL     = $(top_builddir)/sfi/sfidl