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

[pulseaudio] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4174a39b1c5784c5c51ce600bbce3fcc67a6cfc1..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
-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,42 +26,21 @@ noinst_DATA =
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpulse.pc libpulse-simple.pc
 
-if HAVE_HOWL
+if HAVE_AVAHI
 pkgconfig_DATA += \
         libpulse-browse.pc
 endif
 
 if HAVE_GLIB20
 pkgconfig_DATA += \
-        libpulse-glib-mainloop.pc
-endif
-
-if HAVE_GLIB12
-pkgconfig_DATA += \
-       libpulse-glib12-mainloop.pc
-endif
-
-if USE_LYNX
-EXTRA_DIST += README
-MAINTAINERCLEANFILES += README
-noinst_DATA += README
-
-README:
-       rm -f README
-       $(MAKE) -C doc README
-       cd $(srcdir) && ln -s doc/README README
+        libpulse-mainloop-glib.pc
 endif
 
 homepage: all dist doxygen
        test -d $$HOME/homepage/private
        mkdir -p $$HOME/homepage/private/projects/pulseaudio $$HOME/homepage/private/projects/pulseaudio/doxygen
        cp pulseaudio-@PACKAGE_VERSION@.tar.gz $$HOME/homepage/private/projects/pulseaudio
-       cp doc/README.html doc/FAQ.html doc/cli.html doc/daemon.html doc/modules.html doc/style.css $$HOME/homepage/private/projects/pulseaudio
        cp -a doxygen/html/* $$HOME/homepage/private/projects/pulseaudio/doxygen
-       ln -sf $$HOME/homepage/private/projects/pulseaudio/README.html $$HOME/homepage/private/projects/pulseaudio/index.html
-
-#distcleancheck:
-#      @:
 
 doxygen:
        $(MAKE) -C doxygen doxygen