Update pkgconfig files to reduce overlinking.

[platform/upstream/libvorbis.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 506178d..e05d521 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign dist-zip
+#AUTOMAKE_OPTIONS = 1.7 foreign dist-zip dist-bzip2
+AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
 
-SUBDIRS = lib include doc examples vq
+SUBDIRS = m4 include vq lib test doc
+
+if BUILD_EXAMPLES 
+SUBDIRS += examples 
+endif 
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = vorbis.m4
@@ -11,6 +16,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = vorbis.pc vorbisenc.pc vorbisfile.pc
 
 EXTRA_DIST = \
+       CHANGES COPYING \
        todo.txt autogen.sh \
        libvorbis.spec libvorbis.spec.in \
        vorbis.m4 \
@@ -18,6 +24,7 @@ EXTRA_DIST = \
        vorbis-uninstalled.pc.in \
        vorbisenc-uninstalled.pc.in \
        vorbisfile-uninstalled.pc.in \
+       symbian \
        macos macosx win32