Revert parts of 96d081c1 that touched source code or autotools files.

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

diff --git a/Makefile.am b/Makefile.am
index 5627bb5..603c032 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 #  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2001,2002,2003,2004,2005,2006,2007  Josh Coalson
+#  Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
 #
 #  This file is part the FLAC project.  FLAC is comprised of several
 #  components distributed under difference licenses.  The codec libraries
@@ -28,9 +28,9 @@
 # distclean: remove everything except what goes in the distribution
 #
 
-AUTOMAKE_OPTIONS = foreign 1.7
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = doc include m4 man src examples test build obj
+SUBDIRS = doc include m4 man src examples test build objs
 
 DISTCLEANFILES = libtool-disable-static
 
@@ -50,3 +50,8 @@ EXTRA_DIST = \
        depcomp \
        ltmain.sh \
        strip_non_asm_libtool_args.sh
+
+fullcheck:
+       (cd test && make fullcheck)
+
+CLEANFILES = *~