Harmonize the spec and stand-alone versions of the comment header docs.

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

diff --git a/Makefile.am b/Makefile.am
index f299688..a2ce967 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign dist-zip
 
-SUBDIRS = lib include doc examples win32 debian vq
+SUBDIRS = lib include doc examples win32 vq
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = vorbis.m4
@@ -10,18 +10,27 @@ m4data_DATA = vorbis.m4
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = vorbis.pc vorbisenc.pc vorbisfile.pc
 
-EXTRA_DIST = todo.txt macos macosx autogen.sh \
+# we include the whole debian/ dir in EXTRA_DIST because there's a problem
+# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
+# to pick up on the lowercase changelog file and add ChangeLog to DIST_COMMON
+# because of it, breaking make dist.  This works just as well.
+EXTRA_DIST = \
+       todo.txt macos macosx autogen.sh \
        libvorbis.spec libvorbis.spec.in \
-       vorbis.m4 vorbis.pc.in vorbisenc.pc.in vorbisfile.pc.in \
-       vorbis-uninstalled.pc.in \
-       vorbisenc-uninstalled.pc.in \
-       vorbisfile-uninstalled.pc.in
+       vorbis.m4 \
+       vorbis.pc.in vorbisenc.pc.in vorbisfile.pc.in \
+       vorbis-uninstalled.pc.in \
+       vorbisenc-uninstalled.pc.in \
+       vorbisfile-uninstalled.pc.in \
+       debian
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-docs
 
 dist-hook:
-       rm -rf `find $(distdir)/macos -name CVS`
-       rm -rf `find $(distdir)/macosx -name CVS`
+       rm -rf `find $(distdir)/debian -name .svn`
+       rm -rf `find $(distdir)/debian -name "Makefile*"`
+       rm -rf `find $(distdir)/macos -name .svn`
+       rm -rf `find $(distdir)/macosx -name .svn`
 
 debug:
        $(MAKE) all CFLAGS="@DEBUG@"