* split pa_cstrerror() into its own file polypcore/core-error.[ch]

[pulseaudio] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a298397b6d557bf038cf46155c96e2704d5600c6..3a8c9bba7fdf0d6dafd1c5412ec2bb8cc6013007 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,7 +78,7 @@ EXTRA_DIST = \
                daemon/default.pa.in \
                depmod.py \
                daemon/esdcompat.sh.in \
-               utils/padsp.in \
+               utils/padsp \
                modules/module-defs.h.m4
 
 polypconf_DATA = \
@@ -402,6 +402,7 @@ libpolyp_la_SOURCES += \
                polypcore/strbuf.c polypcore/strbuf.h \
                polypcore/strlist.c polypcore/strlist.h \
                polypcore/tagstruct.c polypcore/tagstruct.h \
+               polypcore/core-error.c polypcore/core-error.h \
                polypcore/winsock.h
 
 if OS_IS_WIN32
@@ -453,14 +454,11 @@ libpolyp_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VER
 #         OSS emulation           #
 ###################################
 
-CLEANFILES=
-
 if HAVE_OSS
 
 lib_LTLIBRARIES += libpolypdsp.la
 
-CLEANFILES += padsp
-bin_SCRIPTS += padsp
+bin_SCRIPTS += utils/padsp
 
 endif
 
@@ -469,9 +467,6 @@ libpolypdsp_la_CFLAGS = $(AM_CFLAGS)
 libpolypdsp_la_LIBADD = $(AM_LIBADD) libpolyp.la
 libpolypdsp_la_LDFLAGS = -avoid-version
 
-padsp: utils/padsp.in Makefile
-       sed -e 's,@LIBPOLYPDSP\@,$(libdir)/libpolypdsp.so,g' < $< > $@
-
 ###################################
 #      Daemon core library        #
 ###################################
@@ -580,7 +575,8 @@ libpolypcore_la_SOURCES += \
                polypcore/source-output.c polypcore/source-output.h \
                polypcore/strbuf.c polypcore/strbuf.h \
                polypcore/tokenizer.c polypcore/tokenizer.h \
-               polypcore/winsock.h
+               polypcore/winsock.h \
+               polypcore/core-error.c polypcore/core-error.h
 
 if OS_IS_WIN32
 libpolypcore_la_SOURCES += \
@@ -1165,7 +1161,7 @@ suid: polypaudio
        chown root $<
        chmod u+s $<
 
-CLEANFILES+=esdcompat.sh client.conf default.pa daemon.conf
+CLEANFILES = esdcompat.sh client.conf default.pa daemon.conf
 
 esdcompat.sh: daemon/esdcompat.sh.in Makefile
        sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
@@ -1192,3 +1188,5 @@ install-exec-hook:
        chmod u+s $(DESTDIR)$(bindir)/polypaudio
        ln -sf pacat $(DESTDIR)$(bindir)/parec
        rm -f $(DESTDIR)$(modlibexecdir)/*.a
+
+.PHONY: utils/padsp