[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-test3-46-gdcee888

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  656fc6660fac6ad4524fd2b679cbd35c69033d3b (commit)

- Log -----------------------------------------------------------------
dcee888... Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
3dd8800... fix typo in FOREIGN_CFLAGS
-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------

commit 3dd8800e6d0ab1f11e981d368ec2bef38c88ce99
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 4 22:07:41 2009 +0100

    fix typo in FOREIGN_CFLAGS

diff --git a/src/Makefile.am b/src/Makefile.am
index 9f2fa02..a70a19a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,7 +86,7 @@ AM_LDFLAGS+=-Wl,--export-all-symbols
 WINSOCK_LIBS=-lwsock32 -lws2_32 -lwininet
 endif
 
-FOREIGN_CLFGAS = -w
+FOREIGN_CFLAGS = -w
 MODULE_LDFLAGS = -module -disable-static -avoid-version
 
 ###################################
@@ -818,7 +818,7 @@ noinst_LTLIBRARIES = libpulsecore-foreign.la
 libpulsecore_foreign_la_SOURCES = \
 		pulsecore/ffmpeg/resample2.c pulsecore/ffmpeg/avcodec.h pulsecore/ffmpeg/dsputil.h
 
-libpulsecore_foreign_la_CFLAGS = $(AM_CFLAGS) -w
+libpulsecore_foreign_la_CFLAGS = $(AM_CFLAGS) $(FOREIGN_CFLAGS)
 
 ###################################
 #   Plug-in support libraries     #

commit dcee8888650583abd106f818ee56d5dff9028bba
Merge: 3dd8800... 656fc66...
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 4 22:07:56 2009 +0100

    Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio


-- 
hooks/post-receive
PulseAudio Sound Server