* remove doc/ directory

* move doc/todo to root dir

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

diff --git a/Makefile.am b/Makefile.am
index d5d9b52..566cec6 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 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 =

diff --git a/configure.ac b/configure.ac
index 6b82eff..300201f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -677,7 +677,6 @@ libpulse-simple.pc
 libpulse-browse.pc
 libpulse-mainloop-glib.pc
 libpulse-mainloop-glib12.pc
-doc/Makefile
 doxygen/Makefile
 doxygen/doxygen.conf
 src/pulse/version.h

diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644 (file)
index 1e9fe24..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id$
-
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-EXTRA_DIST = todo
-

diff --git a/doc/todo b/todo
similarity index 100%
rename from doc/todo
rename to todo