diff options
| author | Pierre Ossman <ossman@cendio.se> | 2007-03-01 17:15:43 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2007-03-01 17:15:43 +0000 |
| commit | 19b17ff50447875d55ef4c819fd0f3c45537cce9 (patch) | |
| tree | 605ea791e88568106cebf9716f6150db6c832350 | |
| parent | bb812433a8847704ab7681aad812558439e176ee (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
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 2 insertions, 5 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 diff --git a/configure.ac b/configure.ac index 68ad6727..65a99a00 100644 --- a/configure.ac +++ b/configure.ac @@ -772,7 +772,6 @@ AM_CONDITIONAL([FORCE_PREOPEN], [test "x$FORCE_PREOPEN" = "x1"]) AC_CONFIG_FILES([ Makefile src/Makefile -po/Makefile.in libpulse.pc libpulse-simple.pc libpulse-browse.pc |