summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2007-03-01 17:15:43 +0000
committerPierre Ossman <ossman@cendio.se>2007-03-01 17:15:43 +0000
commit19b17ff50447875d55ef4c819fd0f3c45537cce9 (patch)
tree605ea791e88568106cebf9716f6150db6c832350 /Makefile.am
parentbb812433a8847704ab7681aad812558439e176ee (diff)
Revert stuff from commit 1431 that wasn't supposed to be there.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1432 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 765e8fa4..1b77187d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
-EXTRA_DIST = config.rpath m4/ChangeLog bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
-SUBDIRS= libltdl src 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 =
@@ -46,5 +46,3 @@ doxygen:
$(MAKE) -C doxygen doxygen
.PHONY: homepage distcleancheck doxygen
-
-ACLOCAL_AMFLAGS = -I m4