diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-02-16 21:37:20 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-02-16 21:37:20 +0000 |
| commit | b56b9e50e027c22fc56c805d8d0cd10d99a4cd5b (patch) | |
| tree | 05ba82ac9aa2fd4b8492c71eec9286fca1e0136f | |
| parent | e205b25d65ccb380fa158711e24d55b6de5d9bc1 (diff) | |
* svn:ignore some files
* move configuration files to the directories they belong to
* built esd-compat.sh in the src/ dir
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@488 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | src/Makefile.am | 30 | ||||
| -rw-r--r-- | src/daemon/daemon.conf.in (renamed from src/daemon.conf.in) | 0 | ||||
| -rwxr-xr-x | src/daemon/default.pa.in (renamed from src/default.pa.in) | 0 | ||||
| -rw-r--r-- | src/daemon/default.pa.win32 (renamed from src/default.pa.win32) | 0 | ||||
| -rwxr-xr-x | src/daemon/esdcompat.sh.in (renamed from src/utils/esdcompat.sh.in) | 0 | ||||
| -rw-r--r-- | src/polyp/client.conf.in (renamed from src/client.conf.in) | 0 |
6 files changed, 17 insertions, 13 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 92c7dae1..8131794c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -75,16 +75,20 @@ endif ################################### EXTRA_DIST = \ - client.conf.in \ - daemon.conf.in \ - default.pa.in \ + polyp/client.conf.in \ + daemon/daemon.conf.in \ + daemon/default.pa.in \ depmod.py \ - utils/esdcompat.sh.in \ + daemon/esdcompat.sh.in \ modules/module-defs.h.m4 -polypconf_DATA = default.pa daemon.conf client.conf +polypconf_DATA = \ + default.pa \ + daemon.conf \ + client.conf -BUILT_SOURCES = polyp/polyplib-version.h +BUILT_SOURCES = \ + polyp/polyplib-version.h ################################### # Main daemon # @@ -131,10 +135,10 @@ bin_PROGRAMS += pax11publish endif if HAVE_HOWL -bin_PROGRAMS += pabrowse +bin_PROGRAMS += pabrowse endif -bin_SCRIPTS = utils/esdcompat.sh +bin_SCRIPTS = daemon/esdcompat.sh pacat_SOURCES = utils/pacat.c pacat_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la @@ -1035,23 +1039,23 @@ suid: polypaudio chown root $< chmod u+s $< -utils/esdcompat.sh: utils/esdcompat.sh.in Makefile +esdcompat.sh: daemon/esdcompat.sh.in Makefile sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@ -client.conf: client.conf.in Makefile +client.conf: polyp/client.conf.in Makefile sed -e 's,@POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@ if OS_IS_WIN32 -default.pa: default.pa.win32 +default.pa: daemon/default.pa.win32 cp $< $@ else -default.pa: default.pa.in Makefile +default.pa: daemon/default.pa.in Makefile sed -e 's,@POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@ endif -daemon.conf: daemon.conf.in Makefile +daemon.conf: daemon/daemon.conf.in Makefile sed -e 's,@DLSEARCHPATH\@,$(modlibdir),g' \ -e 's,@DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@ diff --git a/src/daemon.conf.in b/src/daemon/daemon.conf.in index d5373018..d5373018 100644 --- a/src/daemon.conf.in +++ b/src/daemon/daemon.conf.in diff --git a/src/default.pa.in b/src/daemon/default.pa.in index 3aaeeaf0..3aaeeaf0 100755 --- a/src/default.pa.in +++ b/src/daemon/default.pa.in diff --git a/src/default.pa.win32 b/src/daemon/default.pa.win32 index 3478adab..3478adab 100644 --- a/src/default.pa.win32 +++ b/src/daemon/default.pa.win32 diff --git a/src/utils/esdcompat.sh.in b/src/daemon/esdcompat.sh.in index 76023f52..76023f52 100755 --- a/src/utils/esdcompat.sh.in +++ b/src/daemon/esdcompat.sh.in diff --git a/src/client.conf.in b/src/polyp/client.conf.in index fbf645a4..fbf645a4 100644 --- a/src/client.conf.in +++ b/src/polyp/client.conf.in |