fix typos

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

diff --git a/src/Makefile.am b/src/Makefile.am
index d0edd5f..7afb0e2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,36 +1,46 @@
 #  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2001,2002  Josh Coalson
+#  Copyright (C) 2001,2002,2003,2004  Josh Coalson
 #
-#  This program is part of FLAC; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
+#  This file is part the FLAC project.  FLAC is comprised of several
+#  components distributed under difference licenses.  The codec libraries
+#  are distributed under Xiph.Org's BSD-like license (see the file
+#  COPYING.Xiph in this distribution).  All other programs, libraries, and
+#  plugins are distributed under the GPL (see COPYING.GPL).  The documentation
+#  is distributed under the Gnu FDL (see COPYING.FDL).  Each file in the
+#  FLAC distribution contains at the top the terms under which it may be
+#  distributed.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#  Since this particular file is relevant to all components of FLAC,
+#  it may be distributed under the Xiph.Org license, which is the least
+#  restrictive of those mentioned above.  See the file COPYING.Xiph in this
+#  distribution.
 
 if FLaC__HAS_XMMS
 XMMS_DIRS = plugin_xmms
 endif
 
-EXTRA_DIST = \
-       monkeys_audio_utilities \
-       plugin_winamp2 \
-       plugin_winamp3
+if FLaC__HAS_OGG
+OGGFLAC_DIRS = libOggFLAC libOggFLAC++
+OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++
+endif
 
 SUBDIRS = \
        libFLAC \
        libFLAC++ \
+       $(OGGFLAC_DIRS) \
        share \
        flac \
        metaflac \
+       monkeys_audio_utilities \
+       plugin_common \
        $(XMMS_DIRS) \
+       plugin_winamp2 \
+       test_grabbag \
        test_libFLAC \
        test_libFLAC++ \
+       $(OGGFLAC_TEST_DIRS) \
+       test_seeking \
        test_streams
+
+EXTRA_DIST = \
+       Makefile.lite