[polypaudio-commits] r488 - in /trunk/src: ./ Makefile.am client.conf.in daemon.conf.in daemon/daemon.conf.in daemon/default.pa.in daemon/default.pa.win32 daemon/esdcompat.sh.in default.pa.in default.pa.win32 modules/ polyp/ polyp/client.conf.in utils/esdcompat.sh.in

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Thu Feb 16 22:37:20 2006
New Revision: 488

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=488&root=polypaudio&view=rev
Log:
* svn:ignore some files
* move configuration files to the directories they belong to
* built esd-compat.sh in the src/ dir

Added:
    trunk/src/daemon/daemon.conf.in
      - copied unchanged from r487, trunk/src/daemon.conf.in
    trunk/src/daemon/default.pa.in
      - copied unchanged from r487, trunk/src/default.pa.in
    trunk/src/daemon/default.pa.win32
      - copied unchanged from r487, trunk/src/default.pa.win32
    trunk/src/daemon/esdcompat.sh.in
      - copied unchanged from r487, trunk/src/utils/esdcompat.sh.in
    trunk/src/polyp/client.conf.in
      - copied unchanged from r487, trunk/src/client.conf.in
Removed:
    trunk/src/client.conf.in
    trunk/src/daemon.conf.in
    trunk/src/default.pa.in
    trunk/src/default.pa.win32
    trunk/src/utils/esdcompat.sh.in
Modified:
    trunk/src/   (props changed)
    trunk/src/Makefile.am
    trunk/src/modules/   (props changed)
    trunk/src/polyp/   (props changed)

Propchange: trunk/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 16 22:37:20 2006
@@ -1,0 +1,23 @@
+pax11publish
+voltest
+paplay
+pacat-simple
+parec-simple
+daemon.conf
+Makefile
+strlist-test
+pacmd
+cpulimit-test
+polypaudio
+mcalign-test
+mainloop-test
+pacat
+Makefile.in
+default.pa
+cpulimit-test2
+client.conf
+pactl
+mainloop-test-glib
+mainloop-test-glib12
+.libs
+.deps

Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=488&root=polypaudio&r1=487&r2=488&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Thu Feb 16 22:37:20 2006
@@ -75,16 +75,20 @@
 ###################################
 
 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
-
-BUILT_SOURCES = polyp/polyplib-version.h
+polypconf_DATA = \
+		default.pa \
+		daemon.conf \
+		client.conf
+
+BUILT_SOURCES = \
+		polyp/polyplib-version.h
 
 ###################################
 #          Main daemon            #
@@ -131,10 +135,10 @@
 endif
 
 if HAVE_HOWL
-bin_PROGRAMS += 	pabrowse
-endif
-
-bin_SCRIPTS = utils/esdcompat.sh
+bin_PROGRAMS += pabrowse
+endif
+
+bin_SCRIPTS = daemon/esdcompat.sh
 
 pacat_SOURCES = utils/pacat.c
 pacat_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la libpolyp-error- at PA_MAJORMINOR@.la libpolyp-mainloop- at PA_MAJORMINOR@.la
@@ -1035,23 +1039,23 @@
 	chown root $<
 	chmod u+s $<
 
-utils/esdcompat.sh: utils/esdcompat.sh.in Makefile
+esdcompat.sh: daemon/esdcompat.sh.in Makefile
 	sed -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 		-e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 		-e 's, at POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
 
-client.conf: client.conf.in Makefile
+client.conf: polyp/client.conf.in Makefile
 	sed -e 's, at 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, at POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
 endif
 
-daemon.conf: daemon.conf.in Makefile
+daemon.conf: daemon/daemon.conf.in Makefile
 	sed -e 's, at DLSEARCHPATH\@,$(modlibdir),g' \
 		-e 's, at DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@
 

Propchange: trunk/src/modules/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 16 22:37:20 2006
@@ -1,0 +1,1 @@
+module-*-symdef.h

Propchange: trunk/src/polyp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 16 22:37:20 2006
@@ -1,0 +1,1 @@
+polyplib-version.h