diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-07-23 22:46:39 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-07-23 22:46:39 +0200 |
| commit | e7b9da320993840f21f6208ba8a209865fca37ab (patch) | |
| tree | 0cc6ffa7aee271d0702cd9834c7393bab764b745 /src/Makefile.am | |
| parent | c95d0d7dcbca0c531b972ece1004caad95c92936 (diff) | |
add missing pieces for new startup logic
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 788857cd..98d06aa8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -99,9 +99,10 @@ EXTRA_DIST = \ daemon/default.pa.win32 \ depmod.py \ daemon/esdcompat.in \ + daemon/start-pulseaudio-x11.in \ utils/padsp \ modules/module-defs.h.m4 \ - daemon/pulseaudio-module-xsmp.desktop \ + daemon/pulseaudio.desktop \ map-file \ daemon/org.pulseaudio.policy @@ -112,7 +113,7 @@ pulseconf_DATA = \ if HAVE_X11 xdgautostart_DATA = \ - daemon/pulseaudio-module-xsmp.desktop + daemon/pulseaudio.desktop endif BUILT_SOURCES = \ @@ -184,7 +185,7 @@ if HAVE_AVAHI bin_PROGRAMS += pabrowse endif -bin_SCRIPTS = esdcompat +bin_SCRIPTS = esdcompat start-pulseaudio-x11 pacat_SOURCES = utils/pacat.c pacat_LDADD = $(AM_LDADD) libpulse.la @@ -1542,7 +1543,7 @@ suid: pulseaudio .libs/lt-pulseaudio chown root $^ chmod u+s $^ -CLEANFILES = esdcompat client.conf default.pa daemon.conf +CLEANFILES = esdcompat client.conf default.pa daemon.conf start-pulseaudio-x11 esdcompat: daemon/esdcompat.in Makefile sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ @@ -1550,6 +1551,11 @@ esdcompat: daemon/esdcompat.in Makefile -e 's,@PA_BINARY\@,$(PA_BINARY),g' < $< > $@ chmod +x esdcompat +start-pulseaudio-x11: daemon/start-pulseaudio-x11.in Makefile + sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \ + -e 's,@PACTL_BINARY\@,$(bindir)/pactl,g' < $< > $@ + chmod +x start-pulseaudio-x11 + client.conf: pulse/client.conf.in Makefile sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' < $< > $@ |