remove SHARE_LIBS

diff --git a/configure.in b/configure.in
index ab94bd4..2f956d5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -230,8 +230,6 @@ fi
 AM_PATH_XMMS(0.9.5.1, , AC_MSG_WARN([*** XMMS >= 0.9.5.1 not installed - xmms support will not be built]))
 AM_CONDITIONAL(FLaC__HAS_XMMS, test x$XMMS_INPUT_PLUGIN_DIR != x)
 
-SHARE_LIBS='$(top_builddir)/src/share/grabbag/libgrabbag.a $(top_builddir)/src/share/gain_analysis/libgain_analysis.a $(top_builddir)/src/share/getopt/libgetopt.a $(top_builddir)/src/share/utf8/libutf8.a'
-
 dnl check for i18n(internationalization); these are from libiconv/gettext
 AM_ICONV
 AM_LANGINFO_CODESET
@@ -329,8 +327,6 @@ AC_SUBST(FLaC__USIZE32)
 AC_SUBST(FLaC__SIZE64)
 AC_SUBST(FLaC__USIZE64)
 
-AC_SUBST(SHARE_LIBS)
-
 OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include'
 if test x$debug = xtrue; then
        OUR_CFLAGS_TAIL="-g -O0 -DDEBUG"
@@ -388,6 +384,8 @@ AC_OUTPUT( \
        src/share/getopt/Makefile \
        src/share/grabbag/Makefile \
        src/share/utf8/Makefile \
+       src/test_grabbag/cuesheet/Makefile \
+       src/test_grabbag/Makefile \
        src/test_libFLAC/Makefile \
        src/test_libFLAC++/Makefile \
        src/test_libOggFLAC/Makefile \
@@ -406,6 +404,7 @@ AC_OUTPUT( \
        doc/html/images/Makefile \
        doc/html/ru/Makefile \
        man/Makefile \
+       test/cuesheets/Makefile \
        test/Makefile \
        build/Makefile \
        obj/debug/bin/Makefile \

diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
index 1a85b11..3d54a9f 100644 (file)
--- a/src/flac/Makefile.am
+++ b/src/flac/Makefile.am
@@ -38,4 +38,13 @@ flac_SOURCES = \
        encode.h \
        vorbiscomment.h
 
-flac_LDADD = $(NEED_OGGFLAC_LIB) @SHARE_LIBS@ $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ @LIBICONV@ -lm
+flac_LDADD = \
+       $(NEED_OGGFLAC_LIB) \
+       $(top_builddir)/src/share/grabbag/libgrabbag.a \
+       $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
+       $(top_builddir)/src/share/getopt/libgetopt.a \
+       $(top_builddir)/src/share/utf8/libutf8.a \
+       $(top_builddir)/src/libFLAC/libFLAC.la \
+       @OGG_LIBS@ \
+       @LIBICONV@ \
+       -lm

diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am
index 5e86951..f9f802e 100644 (file)
--- a/src/metaflac/Makefile.am
+++ b/src/metaflac/Makefile.am
@@ -32,7 +32,18 @@ metaflac_SOURCES = \
        operations_shorthand_vorbiscomment.c \
        options.c \
        usage.c \
-       utils.c
+       utils.c \
+       operations.h \
+       options.h \
+       usage.h \
+       utils.h
 metaflac_LDFLAGS = 
 
-metaflac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @SHARE_LIBS@ @LIBICONV@ -lm
+metaflac_LDADD = \
+       $(top_builddir)/src/share/grabbag/libgrabbag.a \
+       $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
+       $(top_builddir)/src/share/getopt/libgetopt.a \
+       $(top_builddir)/src/share/utf8/libutf8.a \
+       $(top_builddir)/src/libFLAC/libFLAC.la \
+       @LIBICONV@ \
+       -lm

diff --git a/src/plugin_xmms/Makefile.am b/src/plugin_xmms/Makefile.am
index 82d62c5..6e8393c 100644 (file)
--- a/src/plugin_xmms/Makefile.am
+++ b/src/plugin_xmms/Makefile.am
@@ -53,8 +53,10 @@ endif
 #   http://lists.freshrpms.net/pipermail/rpm-list/2002-April/000746.html
 # the workaround is the extra '-L$(top_builddir)/src/libFLAC/.libs'
 libxmms_flac_la_LIBADD = \
-       @SHARE_LIBS@ \
        $(top_builddir)/src/plugin_common/libplugin_common.a \
+       $(top_builddir)/src/share/grabbag/libgrabbag.a \
+       $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
+       $(top_builddir)/src/share/utf8/libutf8.a \
        $(top_builddir)/src/libFLAC/libFLAC.la \
        -L$(top_builddir)/src/libFLAC/.libs \
        @XMMS_LIBS@ \