Revert stuff from commit 1431 that wasn't supposed to be there.

[pulseaudio] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0884476d4cda201061b7698311c302cceffce956..1b77187de5a64091272258ddd5aaa2e4310b5c34 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in libtool.m4 ltdl.m4 README
-SUBDIRS=libltdl src doc doxygen
+EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
+SUBDIRS=libltdl src doxygen
 
 MAINTAINERCLEANFILES =
 noinst_DATA =
@@ -26,7 +26,7 @@ noinst_DATA =
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpulse.pc libpulse-simple.pc
 
-if HAVE_HOWL
+if HAVE_AVAHI
 pkgconfig_DATA += \
         libpulse-browse.pc
 endif
@@ -36,11 +36,6 @@ pkgconfig_DATA += \
         libpulse-mainloop-glib.pc
 endif
 
-if HAVE_GLIB12
-pkgconfig_DATA += \
-       libpulse-mainloop-glib12.pc
-endif
-
 homepage: all dist doxygen
        test -d $$HOME/homepage/private
        mkdir -p $$HOME/homepage/private/projects/pulseaudio $$HOME/homepage/private/projects/pulseaudio/doxygen