Since README is generated conditionally we must make sure there are no

dependencies on it when it's not built.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/ossman@363 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/Makefile.am b/Makefile.am
index a6a012af4de842d7d89285c3157cb2c301650523..2cf93c75dc5894d261838d0fba0a4a2d940ef57b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,11 +17,11 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-EXTRA_DIST = bootstrap.sh README LICENSE doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in libtool.m4 ltdl.m4
+EXTRA_DIST = bootstrap.sh LICENSE doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in libtool.m4 ltdl.m4
 SUBDIRS=libltdl polyp doc
 
-MAINTAINERCLEANFILES=README
-noinst_DATA = README
+MAINTAINERCLEANFILES =
+noinst_DATA =
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = polyplib.pc polyplib-simple.pc polyplib-error.pc polyplib-mainloop.pc polyplib-browse.pc
@@ -36,10 +36,16 @@ pkgconfig_DATA += \
        polyplib-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
+endif
 
 homepage: all dist doxygen
        test -d $$HOME/homepage/private

diff --git a/doc/Makefile.am b/doc/Makefile.am
index fff0655103f499da967b059c659a5d14daf3a908..c68c00f56c2d42429298d0d758bdef66a67e03f5 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,7 +16,7 @@
 # along with polypaudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
-noinst_DATA = README.html cli.html modules.html daemon.html README
+noinst_DATA = README.html cli.html modules.html daemon.html
 EXTRA_DIST = $(noinst_DATA) style.css README.html.in cli.html.in modules.html.in daemon.html.in todo FAQ.html.in
 
 MAINTAINERCLEANFILES = README.html cli.html modules.html daemon.html FAQ.html
@@ -26,6 +26,7 @@ if USE_LYNX
 README: README.html
        lynx --dump $^ | sed 's,file://localhost/.*/doc/README.html,README,' > $@
 
+noinst_DATA += README
 CLEANFILES += README
 endif