[pulseaudio-commits] src/.gitignore src/Makefile.am src/utils

[Arun Raghavan]

 src/.gitignore       |    1 +
 src/Makefile.am      |   12 ++++++------
 src/utils/.gitignore |    1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d9cd26f676ed8476a4e1e4293927177d8495b97b
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Mon Feb 20 19:23:47 2012 +0530

    build: Fix out-of-tree build
    
    Previous commits broke the out-of-tree build on padsp.

diff --git a/src/.gitignore b/src/.gitignore
index cbde067..f77749b 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -16,6 +16,7 @@ gconf-helper
 pacat
 pacmd
 pactl
+padsp
 paplay
 pasuspender
 pax11publish
diff --git a/src/Makefile.am b/src/Makefile.am
index 39e9522..603ccc3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -764,15 +764,15 @@ libpulse_mainloop_glib_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version
 if HAVE_OSS_WRAPPER
 padsplibdir = $(pkglibdir)
 padsplib_LTLIBRARIES = libpulsedsp.la
-bin_SCRIPTS += utils/padsp
+bin_SCRIPTS += padsp
 
-edit = @sed \
+edit = @SED@ \
        -e "s|@pkglibdir[@]|$(pkglibdir)|g"
 
-utils/padsp: utils/padsp.in
-	$(edit) $< >$@
+padsp: utils/padsp.in
+	$(edit) $< > $@
 
-CLEANFILES += utils/padsp
+CLEANFILES += padsp
 
 endif
 
@@ -2011,4 +2011,4 @@ $(installmodlibexecLTLIBRARIES): install-pkglibLTLIBRARIES
 installpadsplibLTLIBRARIES = install-padsplibLTLIBRARIES
 $(installpadsplibLTLIBRARIES): install-libLTLIBRARIES
 
-.PHONY: utils/padsp massif update-all update-ffmpeg update-sbc update-map-file
+.PHONY: padsp massif update-all update-ffmpeg update-sbc update-map-file
diff --git a/src/utils/.gitignore b/src/utils/.gitignore
deleted file mode 100644
index 1bf1c53..0000000
--- a/src/utils/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-padsp