fix make distcheck

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@751 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am
index 79354b21719a19c1cf9f6e26f29c2974fb992747..a68db5770e5f7b08dc42f707c14c434c3ba0ea10 100644 (file)
--- a/doxygen/Makefile.am
+++ b/doxygen/Makefile.am
@@ -20,7 +20,13 @@
 doxygen: doxygen.conf
        doxygen $<
 
+distclean-local:
+       -rm -f doxygen.conf Makefile
+
+maintainerc-cleanlocal:
+       -rm -f Makefile.in
+
 clean-local:
-       rm -rf html
+       -rm -rf html
 
 .PHONY: all doxygen

diff --git a/src/Makefile.am b/src/Makefile.am
index e02811b57adf7a0101fb604f3e0071432b5c353f..0705e152887e3441e658e9b03a1894909a10b452 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -327,7 +327,6 @@ libpolyp_@PA_MAJORMINOR@_la_SOURCES = \
                polyp/cdecl.h \
                polyp/channelmap.c polyp/channelmap.h \
                polyp/client-conf.c polyp/client-conf.h \
-               polyp/llist.h \
                polyp/mainloop-api.c polyp/mainloop-api.h \
                polyp/polypaudio.h \
                polyp/context.c polyp/context.h \
@@ -374,7 +373,8 @@ libpolyp_@PA_MAJORMINOR@_la_SOURCES += \
                polypcore/tagstruct.c polypcore/tagstruct.h \
                polypcore/util.c polypcore/util.h \
                polypcore/winsock.h \
-               polypcore/xmalloc.c polypcore/xmalloc.h
+               polypcore/xmalloc.c polypcore/xmalloc.h \
+               polypcore/llist.h
 
 if OS_IS_WIN32
 libpolyp_@PA_MAJORMINOR@_la_SOURCES += \
@@ -1101,6 +1101,8 @@ suid: polypaudio
        chown root $<
        chmod u+s $<
 
+CLEANFILES=esdcompat.sh client.conf default.pa daemon.conf
+
 esdcompat.sh: daemon/esdcompat.sh.in Makefile
        sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \