Use recursive automake in src/share/ part of tree.

This will make it easier to incorporate the win_utf8_io stuff.

diff --git a/configure.ac b/configure.ac
index 8b6edcb..bda568f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -417,13 +417,6 @@ AC_CONFIG_FILES([ \
        src/plugin_common/Makefile \
        src/plugin_xmms/Makefile \
        src/share/Makefile \
-       src/share/getopt/Makefile \
-       src/share/grabbag/Makefile \
-       src/share/replaygain_analysis/Makefile \
-       src/share/replaygain_synthesis/Makefile \
-       src/share/replaygain_synthesis/include/Makefile \
-       src/share/replaygain_synthesis/include/private/Makefile \
-       src/share/utf8/Makefile \
        src/test_grabbag/Makefile \
        src/test_grabbag/cuesheet/Makefile \
        src/test_grabbag/picture/Makefile \

diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
index 1ddd3ce..6f0145b 100644 (file)
--- a/src/flac/Makefile.am
+++ b/src/flac/Makefile.am
@@ -46,7 +46,7 @@ flac_SOURCES = \
 flac_LDADD = \
        $(top_builddir)/src/share/utf8/libutf8.la \
        $(top_builddir)/src/share/grabbag/libgrabbag.la \
-       $(top_builddir)/src/share/getopt/libgetopt.a \
+       $(top_builddir)/src/share/getopt/libgetopt.la \
        $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
        $(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
        $(top_builddir)/src/libFLAC/libFLAC.la \

diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am
index 3cda2a2..dc286dc 100644 (file)
--- a/src/metaflac/Makefile.am
+++ b/src/metaflac/Makefile.am
@@ -44,7 +44,7 @@ metaflac_LDFLAGS =
 metaflac_LDADD = \
        $(top_builddir)/src/share/grabbag/libgrabbag.la \
        $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
-       $(top_builddir)/src/share/getopt/libgetopt.a \
+       $(top_builddir)/src/share/getopt/libgetopt.la \
        $(top_builddir)/src/share/utf8/libutf8.la \
        $(top_builddir)/src/libFLAC/libFLAC.la \
        @OGG_LIBS@ \

diff --git a/src/share/Makefile.am b/src/share/Makefile.am
index 267674e..8c32588 100644 (file)
--- a/src/share/Makefile.am
+++ b/src/share/Makefile.am
@@ -15,8 +15,65 @@
 #  restrictive of those mentioned above.  See the file COPYING.Xiph in this
 #  distribution.
 
-SUBDIRS = getopt replaygain_analysis replaygain_synthesis grabbag utf8
+AUTOMAKE_OPTIONS = subdir-objects
+
+AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/include/share
 
 EXTRA_DIST = \
        Makefile.lite \
-       README
+       README \
+       getopt/Makefile.lite \
+       getopt/getopt_static.vcproj \
+       grabbag/Makefile.lite \
+       grabbag/grabbag_static.vcproj \
+       replaygain_analysis/Makefile.lite \
+       replaygain_analysis/replaygain_analysis_static.vcproj \
+       replaygain_synthesis/Makefile.lite \
+       replaygain_synthesis/replaygain_synthesis_static.vcproj \
+       replaygain_synthesis/include/private/fast_float_math_hack.h \
+       utf8/Makefile.lite \
+       utf8/charmaps.h \
+       utf8/makemap.c \
+       utf8/charset_test.c \
+       utf8/charsetmap.h \
+       utf8/iconvert.h \
+       utf8/utf8_static.vcproj \
+       win_utf8_io/win_utf8_io.vcproj
+
+
+noinst_LTLIBRARIES = \
+       getopt/libgetopt.la \
+       grabbag/libgrabbag.la \
+       utf8/libutf8.la \
+       replaygain_analysis/libreplaygain_analysis.la \
+       replaygain_synthesis/libreplaygain_synthesis.la
+
+
+getopt_libgetopt_la_SOURCES = getopt/getopt.c getopt/getopt1.c
+
+grabbag_libgrabbag_la_SOURCES = \
+       grabbag/alloc.c \
+       grabbag/cuesheet.c \
+       grabbag/file.c \
+       grabbag/picture.c \
+       grabbag/replaygain.c \
+       grabbag/seektable.c \
+       grabbag/snprintf.c
+
+utf8_libutf8_la_SOURCES = \
+       utf8/charset.c \
+       utf8/charset.h \
+       utf8/iconvert.c \
+       utf8/utf8.c \
+       win_utf8_io/win_utf8_io.c
+
+replaygain_analysis_libreplaygain_analysis_la_SOURCES = replaygain_analysis/replaygain_analysis.c
+
+replaygain_synthesis_libreplaygain_synthesis_la_CFLAGS = -I $(top_srcdir)/src/share/replaygain_synthesis/include
+replaygain_synthesis_libreplaygain_synthesis_la_SOURCES = replaygain_synthesis/replaygain_synthesis.c
+
+debug:
+       $(MAKE) all CFLAGS="@DEBUG@"
+
+profile:
+       $(MAKE) all CFLAGS="@PROFILE@"

diff --git a/src/share/getopt/Makefile.am b/src/share/getopt/Makefile.am
deleted file mode 100644 (file)
index c4021af..0000000
--- a/src/share/getopt/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/include/share
-
-noinst_LIBRARIES = libgetopt.a
-
-libgetopt_a_SOURCES = getopt.c getopt1.c
-
-EXTRA_DIST = \
-       Makefile.lite \
-       getopt_static.vcproj
-
-debug:
-       $(MAKE) all CFLAGS="@DEBUG@"
-
-profile:
-       $(MAKE) all CFLAGS="@PROFILE@"

diff --git a/src/share/grabbag/Makefile.am b/src/share/grabbag/Makefile.am
deleted file mode 100644 (file)
index 79d211e..0000000
--- a/src/share/grabbag/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES = libgrabbag.la
-
-libgrabbag_la_SOURCES = \
-       alloc.c \
-       cuesheet.c \
-       file.c \
-       picture.c \
-       replaygain.c \
-       seektable.c \
-       snprintf.c
-
-EXTRA_DIST = \
-       Makefile.lite \
-       grabbag_static.vcproj
-
-debug:
-       $(MAKE) all CFLAGS="@DEBUG@"
-
-profile:
-       $(MAKE) all CFLAGS="@PROFILE@"

diff --git a/src/share/replaygain_analysis/Makefile.am b/src/share/replaygain_analysis/Makefile.am
deleted file mode 100644 (file)
index 9e1ce55..0000000
--- a/src/share/replaygain_analysis/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/include/share
-
-noinst_LTLIBRARIES = libreplaygain_analysis.la
-
-libreplaygain_analysis_la_SOURCES = replaygain_analysis.c
-
-EXTRA_DIST = \
-       Makefile.lite \
-       replaygain_analysis_static.vcproj
-
-debug:
-       $(MAKE) all CFLAGS="@DEBUG@"
-
-profile:
-       $(MAKE) all CFLAGS="@PROFILE@"

diff --git a/src/share/replaygain_synthesis/Makefile.am b/src/share/replaygain_synthesis/Makefile.am
deleted file mode 100644 (file)
index 22fbe82..0000000
--- a/src/share/replaygain_synthesis/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = include .
-
-AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/include/share
-
-noinst_LTLIBRARIES = libreplaygain_synthesis.la
-
-libreplaygain_synthesis_la_SOURCES = replaygain_synthesis.c
-
-EXTRA_DIST = \
-       Makefile.lite \
-       replaygain_synthesis_static.vcproj
-
-debug:
-       $(MAKE) all CFLAGS="@DEBUG@"
-
-profile:
-       $(MAKE) all CFLAGS="@PROFILE@"

diff --git a/src/share/replaygain_synthesis/include/Makefile.am b/src/share/replaygain_synthesis/include/Makefile.am
deleted file mode 100644 (file)
index 2c0027c..0000000
--- a/src/share/replaygain_synthesis/include/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#  replaygain_synthesis - Routines for applying ReplayGain to a signal
-#  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
-# 
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License, or (at your option) any later version.
-#
-#  This library 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
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-SUBDIRS = private

diff --git a/src/share/replaygain_synthesis/include/private/Makefile.am b/src/share/replaygain_synthesis/include/private/Makefile.am
deleted file mode 100644 (file)
index b8f2e1d..0000000
--- a/src/share/replaygain_synthesis/include/private/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#  replaygain_synthesis - Routines for applying ReplayGain to a signal
-#  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
-# 
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License, or (at your option) any later version.
-#
-#  This library 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
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-noinst_HEADERS = \
-       fast_float_math_hack.h