[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-295-g96f01bf

[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  5f6641cfdd49d64b1cbc68ed025f9d22edc2665c (commit)

- Log -----------------------------------------------------------------
96f01bf... Merge commit '7104d54bbce8f9bd2553e16f45f3a0f69ac75b8b'
7104d54... Add proper -I directives for out-of-tree builds.
348c2ca... Create only the directory the current target should be created into.
-----------------------------------------------------------------------

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

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

commit 348c2cab712203f23310b56952d9b42284af8482
Author: Diego E. 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date:   Mon Jan 19 17:20:18 2009 +0100

    Create only the directory the current target should be created into.
    
    With this change, instead of running multiple `mkdir -p` commands in all
    the rules for all the generated definition files, only the call for the
    current generated file is executed.
    
    Not only it should shorten build time (especially for parallel make) but it
    also fixes out-of-tree builds when new directories are added.
    
    The $(dir $@) construct is GNU make-specific, but the rest of the
    buildsystem is already GNU make-dependent so there should be no problem.

diff --git a/src/Makefile.am b/src/Makefile.am
index 99ed7b2..e6feddd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1068,10 +1068,7 @@ EXTRA_DIST += $(SYMDEF_FILES)
 BUILT_SOURCES += $(SYMDEF_FILES)
 
 $(SYMDEF_FILES): modules/module-defs.h.m4
-	$(MKDIR_P) modules
-	$(MKDIR_P) modules/gconf
-	$(MKDIR_P) modules/rtp
-	$(MKDIR_P) modules/bluetooth
+	$(MKDIR_P) $(dir $@)
 	$(M4) -Dfname="$@" $< > $@
 
 # Flat volume

commit 7104d54bbce8f9bd2553e16f45f3a0f69ac75b8b
Author: Diego E. 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date:   Mon Jan 19 17:30:41 2009 +0100

    Add proper -I directives for out-of-tree builds.
    
    When building out of tree, the generated files are put in builddir rather
    than srcdir, so handle that properly.

diff --git a/src/Makefile.am b/src/Makefile.am
index e6feddd..9dd4465 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,10 +47,15 @@ endif
 
 AM_CFLAGS = \
 	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/modules \
+	-I$(top_builddir)/src/modules \
 	-I$(top_srcdir)/src/modules/rtp \
+	-I$(top_builddir)/src/modules/rtp \
 	-I$(top_srcdir)/src/modules/gconf \
+	-I$(top_builddir)/src/modules/gconf \
 	-I$(top_srcdir)/src/modules/bluetooth \
+	-I$(top_builddir)/src/modules/bluetooth \
 	-I$(top_srcdir)/src/modules/raop \
 	$(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
 	$(LTDLINCL) \

commit 96f01bf73fb8321f7dde732ab1b7ce52b5121043
Merge: 5f6641c... 7104d54...
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Jan 19 23:09:58 2009 +0100

    Merge commit '7104d54bbce8f9bd2553e16f45f3a0f69ac75b8b'


-- 
hooks/post-receive
PulseAudio Sound Server