flac-link.patch

   1 --- flac-1.1.0/src/libFLAC/Makefile.am.orig     2003-01-25 19:25:17.000000000 +0100
   2 +++ flac-1.1.0/src/libFLAC/Makefile.am  2004-12-29 20:15:38.516444056 +0100
   3 @@ -27,10 +27,11 @@
   4  if FLaC__CPU_IA32
   5  if FLaC__HAS_NASM
   6  ARCH_SUBDIRS = ia32
   7 -libFLAC_la_LIBADD = ia32/libFLAC-asm.la
   8 +FLAC_ASM = ia32/libFLAC-asm.la
   9  endif
  10  endif
  11  endif
  12 +libFLAC_la_LIBADD = $(FLAC_ASM) -lm
  13
  14  SUBDIRS = $(ARCH_SUBDIRS) include .
  15
  16 --- flac-1.1.0/src/libFLAC++/Makefile.am.orig   2003-01-25 19:25:14.000000000 +0100
  17 +++ flac-1.1.0/src/libFLAC++/Makefile.am        2004-12-29 20:15:38.516444056 +0100
  18 @@ -30,6 +30,7 @@
  19
  20  # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention
  21  libFLAC___la_LDFLAGS = -version-info 3:2:1
  22 +libFLAC___la_LIBADD = $(top_builddir)/src/libFLAC/libFLAC.la
  23
  24  libFLAC___la_SOURCES = \
  25         file_decoder.cpp \
  26 --- flac-1.1.0/src/libOggFLAC/Makefile.am.orig  2003-01-25 19:25:24.000000000 +0100
  27 +++ flac-1.1.0/src/libOggFLAC/Makefile.am       2004-12-29 20:15:38.517443904 +0100
  28 @@ -33,7 +33,7 @@
  29         libOggFLAC_static.dsp \
  30         libOggFLAC.m4
  31
  32 -libOggFLAC_la_LIBADD = @OGG_LIBS@
  33 +libOggFLAC_la_LIBADD = @OGG_LIBS@ $(top_builddir)/src/libFLAC/libFLAC.la
  34  # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention
  35  libOggFLAC_la_LDFLAGS = -version-info 1:2:0
  36
  37 --- flac-1.1.0/src/libOggFLAC++/Makefile.am.orig        2003-01-25 19:25:21.000000000 +0100
  38 +++ flac-1.1.0/src/libOggFLAC++/Makefile.am     2004-12-29 20:15:38.517443904 +0100
  39 @@ -28,6 +28,7 @@
  40         libOggFLAC++_static.dsp \
  41         libOggFLAC++.m4
  42
  43 +libOggFLAC___la_LIBADD = $(top_builddir)/src/libOggFLAC/libOggFLAC.la
  44  # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention
  45  libOggFLAC___la_LDFLAGS = -version-info 0:4:0
  46
  47 --- flac-1.1.0/src/share/gain_analysis/Makefile.am.orig 2003-01-25 19:15:37.000000000 +0100
  48 +++ flac-1.1.0/src/share/gain_analysis/Makefile.am      2004-12-29 20:16:49.145706776 +0100
  49 @@ -4,9 +4,9 @@
  50
  51  INCLUDES = -I$(top_srcdir)/include/share
  52
  53 -noinst_LIBRARIES = libgain_analysis.a
  54 +noinst_LTLIBRARIES = libgain_analysis.la
  55
  56 -libgain_analysis_a_SOURCES = gain_analysis.c
  57 +libgain_analysis_la_SOURCES = gain_analysis.c
  58
  59  EXTRA_DIST = \
  60         Makefile.lite \
  61 --- flac-1.1.0/src/share/getopt/Makefile.am.orig        2003-01-25 19:15:33.000000000 +0100
  62 +++ flac-1.1.0/src/share/getopt/Makefile.am     2004-12-29 20:18:42.113533056 +0100
  63 @@ -4,9 +4,9 @@
  64
  65  INCLUDES = -I$(top_srcdir)/include/share
  66
  67 -noinst_LIBRARIES = libgetopt.a
  68 +noinst_LTLIBRARIES = libgetopt.la
  69
  70 -libgetopt_a_SOURCES = getopt.c getopt1.c
  71 +libgetopt_la_SOURCES = getopt.c getopt1.c
  72
  73  EXTRA_DIST = \
  74         Makefile.lite \
  75 --- flac-1.1.0/src/share/grabbag/Makefile.am.orig       2003-01-25 19:15:39.000000000 +0100
  76 +++ flac-1.1.0/src/share/grabbag/Makefile.am    2004-12-29 20:17:22.297666912 +0100
  77 @@ -4,9 +4,9 @@
  78
  79  INCLUDES = -I$(top_srcdir)/include
  80
  81 -noinst_LIBRARIES = libgrabbag.a
  82 +noinst_LTLIBRARIES = libgrabbag.la
  83
  84 -libgrabbag_a_SOURCES = \
  85 +libgrabbag_la_SOURCES = \
  86         cuesheet.c \
  87         file.c \
  88         replaygain.c \
  89 --- flac-1.1.0/src/share/utf8/Makefile.am.orig  2003-01-25 19:15:36.000000000 +0100
  90 +++ flac-1.1.0/src/share/utf8/Makefile.am       2004-12-29 20:18:11.189234264 +0100
  91 @@ -4,9 +4,9 @@
  92
  93  INCLUDES = -I$(top_srcdir)/include/share
  94
  95 -noinst_LIBRARIES = libutf8.a
  96 +noinst_LTLIBRARIES = libutf8.la
  97
  98 -libutf8_a_SOURCES = charset.c charset.h iconvert.c utf8.c
  99 +libutf8_la_SOURCES = charset.c charset.h iconvert.c utf8.c
 100
 101  EXTRA_DIST = \
 102         Makefile.lite \
 103 --- flac-1.1.0/src/flac/Makefile.am.orig        2003-01-25 19:14:42.000000000 +0100
 104 +++ flac-1.1.0/src/flac/Makefile.am     2004-12-29 20:20:02.112371384 +0100
 105 @@ -41,10 +41,10 @@
 106
 107  flac_LDADD = \
 108         $(NEED_OGGFLAC_LIB) \
 109 -       $(top_builddir)/src/share/grabbag/libgrabbag.a \
 110 -       $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
 111 -       $(top_builddir)/src/share/getopt/libgetopt.a \
 112 -       $(top_builddir)/src/share/utf8/libutf8.a \
 113 +       $(top_builddir)/src/share/grabbag/libgrabbag.la \
 114 +       $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
 115 +       $(top_builddir)/src/share/getopt/libgetopt.la \
 116 +       $(top_builddir)/src/share/utf8/libutf8.la \
 117         $(top_builddir)/src/libFLAC/libFLAC.la \
 118         @OGG_LIBS@ \
 119         @LIBICONV@ \
 120 --- flac-1.1.0/src/metaflac/Makefile.am.orig    2003-01-25 19:14:53.000000000 +0100
 121 +++ flac-1.1.0/src/metaflac/Makefile.am 2004-12-29 20:20:33.753561192 +0100
 122 @@ -39,10 +39,10 @@
 123  metaflac_LDFLAGS =
 124
 125  metaflac_LDADD = \
 126 -       $(top_builddir)/src/share/grabbag/libgrabbag.a \
 127 -       $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
 128 -       $(top_builddir)/src/share/getopt/libgetopt.a \
 129 -       $(top_builddir)/src/share/utf8/libutf8.a \
 130 +       $(top_builddir)/src/share/grabbag/libgrabbag.la \
 131 +       $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
 132 +       $(top_builddir)/src/share/getopt/libgetopt.la \
 133 +       $(top_builddir)/src/share/utf8/libutf8.la \
 134         $(top_builddir)/src/libFLAC/libFLAC.la \
 135         @LIBICONV@ \
 136         -lm
 137 --- flac-1.1.0/src/plugin_common/Makefile.am.orig       2003-01-25 19:15:48.000000000 +0100
 138 +++ flac-1.1.0/src/plugin_common/Makefile.am    2004-12-29 20:19:20.237737296 +0100
 139 @@ -6,7 +6,7 @@
 140
 141  INCLUDES = -I$(top_srcdir)/include @ID3LIB_CFLAGS@
 142
 143 -noinst_LIBRARIES = libplugin_common.a
 144 +noinst_LTLIBRARIES = libplugin_common.la
 145
 146  noinst_HEADERS = \
 147         all.h \
 148 @@ -20,7 +20,7 @@
 149         replaygain_synthesis.h \
 150         vorbiscomment.h
 151
 152 -libplugin_common_a_SOURCES = \
 153 +libplugin_common_la_SOURCES = \
 154         canonical_tag.c \
 155         charset.c \
 156         dither.c \
 157 --- flac-1.1.0/src/plugin_xmms/Makefile.am.orig 2003-01-14 02:33:03.000000000 +0100
 158 +++ flac-1.1.0/src/plugin_xmms/Makefile.am      2004-12-29 20:21:34.061393008 +0100
 159 @@ -57,12 +57,11 @@
 160  #   http://lists.freshrpms.net/pipermail/rpm-list/2002-April/000746.html
 161  # the workaround is the extra '-L$(top_builddir)/src/libFLAC/.libs'
 162  libxmms_flac_la_LIBADD = \
 163 -       $(top_builddir)/src/plugin_common/libplugin_common.a \
 164 -       $(top_builddir)/src/share/grabbag/libgrabbag.a \
 165 -       $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
 166 -       $(top_builddir)/src/share/utf8/libutf8.a \
 167 +       $(top_builddir)/src/plugin_common/libplugin_common.la \
 168 +       $(top_builddir)/src/share/grabbag/libgrabbag.la \
 169 +       $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
 170 +       $(top_builddir)/src/share/utf8/libutf8.la \
 171         $(top_builddir)/src/libFLAC/libFLAC.la \
 172 -       -L$(top_builddir)/src/libFLAC/.libs \
 173         @XMMS_LIBS@ \
 174         @ID3LIB_LIBS@
 175  libxmms_flac_la_LDFLAGS = -module -avoid-version
 176 --- flac-1.1.0/src/test_grabbag/cuesheet/Makefile.am.orig       2003-01-25 19:15:58.000000000 +0100
 177 +++ flac-1.1.0/src/test_grabbag/cuesheet/Makefile.am    2004-12-29 20:22:18.241676584 +0100
 178 @@ -25,8 +25,8 @@
 179  test_cuesheet_SOURCES = \
 180         main.c
 181  test_cuesheet_LDADD = \
 182 -       $(top_builddir)/src/share/grabbag/libgrabbag.a \
 183 -       $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
 184 +       $(top_builddir)/src/share/grabbag/libgrabbag.la \
 185 +       $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
 186         $(top_builddir)/src/libFLAC/libFLAC.la \
 187         -lm
 188
 189 --- flac-1.1.0/src/test_libFLAC/Makefile.am.orig        2003-01-25 19:15:40.000000000 +0100
 190 +++ flac-1.1.0/src/test_libFLAC/Makefile.am     2004-12-29 20:22:36.583888144 +0100
 191 @@ -24,8 +24,8 @@
 192
 193  noinst_PROGRAMS = test_libFLAC
 194  test_libFLAC_LDADD = \
 195 -       $(top_builddir)/src/share/grabbag/libgrabbag.a \
 196 -       $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
 197 +       $(top_builddir)/src/share/grabbag/libgrabbag.la \
 198 +       $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
 199         $(top_builddir)/src/libFLAC/libFLAC.la \
 200         -lm
 201  test_libFLAC_SOURCES = \
 202 --- flac-1.1.0/src/test_libFLAC++/Makefile.am.orig      2003-01-25 19:15:42.000000000 +0100
 203 +++ flac-1.1.0/src/test_libFLAC++/Makefile.am   2004-12-29 20:22:55.074077208 +0100
 204 @@ -24,8 +24,8 @@
 205
 206  noinst_PROGRAMS = test_libFLAC++
 207  test_libFLAC___LDADD = \
 208 -       $(top_builddir)/src/share/grabbag/libgrabbag.a \
 209 -       $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
 210 +       $(top_builddir)/src/share/grabbag/libgrabbag.la \
 211 +       $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
 212         $(top_builddir)/src/libFLAC++/libFLAC++.la \
 213         $(top_builddir)/src/libFLAC/libFLAC.la \
 214         -lm
 215 --- flac-1.1.0/src/test_libOggFLAC/Makefile.am.orig     2003-01-25 19:15:45.000000000 +0100
 216 +++ flac-1.1.0/src/test_libOggFLAC/Makefile.am  2004-12-29 20:23:13.633255784 +0100
 217 @@ -24,8 +24,8 @@
 218
 219  noinst_PROGRAMS = test_libOggFLAC
 220  test_libOggFLAC_LDADD = \
 221 -       $(top_builddir)/src/share/grabbag/libgrabbag.a \
 222 -       $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
 223 +       $(top_builddir)/src/share/grabbag/libgrabbag.la \
 224 +       $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
 225         $(top_builddir)/src/libOggFLAC/libOggFLAC.la \
 226         $(top_builddir)/src/libFLAC/libFLAC.la \
 227         @OGG_LIBS@ \
 228 --- flac-1.1.0/src/test_libOggFLAC++/Makefile.am.orig   2003-01-25 19:15:46.000000000 +0100
 229 +++ flac-1.1.0/src/test_libOggFLAC++/Makefile.am        2004-12-29 20:23:30.614674216 +0100
 230 @@ -24,8 +24,8 @@
 231
 232  noinst_PROGRAMS = test_libOggFLAC++
 233  test_libOggFLAC___LDADD = \
 234 -       $(top_builddir)/src/share/grabbag/libgrabbag.a \
 235 -       $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
 236 +       $(top_builddir)/src/share/grabbag/libgrabbag.la \
 237 +       $(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
 238         $(top_builddir)/src/libOggFLAC++/libOggFLAC++.la \
 239         $(top_builddir)/src/libOggFLAC/libOggFLAC.la \
 240         $(top_builddir)/src/libFLAC/libFLAC.la \