From b500183e95b43575b5f1e5f859c797ca88287eaf Mon Sep 17 00:00:00 2001 From: Ulrich Klauer Date: Sat, 6 Apr 2013 21:28:25 +0200 Subject: [PATCH] Only link against libogg (and libm) if needed Most of the programs don't use libogg or libm directly and should not link to them (overlinking). Signed-off-by: Erik de Castro Lopo --- examples/c/decode/file/Makefile.am | 4 +--- src/flac/Makefile.am | 1 - src/metaflac/Makefile.am | 4 +--- src/plugin_xmms/Makefile.am | 1 - src/test_grabbag/cuesheet/Makefile.am | 4 +--- src/test_grabbag/picture/Makefile.am | 4 +--- src/test_seeking/Makefile.am | 4 +--- 7 files changed, 5 insertions(+), 17 deletions(-) diff --git a/examples/c/decode/file/Makefile.am b/examples/c/decode/file/Makefile.am index 7926e481..d3b2b0e7 100644 --- a/examples/c/decode/file/Makefile.am +++ b/examples/c/decode/file/Makefile.am @@ -22,8 +22,6 @@ EXTRA_DIST = \ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = example_c_decode_file example_c_decode_file_LDADD = \ - $(top_builddir)/src/libFLAC/libFLAC.la \ - @OGG_LIBS@ \ - -lm + $(top_builddir)/src/libFLAC/libFLAC.la example_c_decode_file_SOURCES = main.c diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am index 6f0145bb..ceae6a5f 100644 --- a/src/flac/Makefile.am +++ b/src/flac/Makefile.am @@ -50,7 +50,6 @@ flac_LDADD = \ $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \ $(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \ $(top_builddir)/src/libFLAC/libFLAC.la \ - @OGG_LIBS@ \ @LIBICONV@ \ -lm diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am index dc286dc1..bd54356a 100644 --- a/src/metaflac/Makefile.am +++ b/src/metaflac/Makefile.am @@ -47,8 +47,6 @@ metaflac_LDADD = \ $(top_builddir)/src/share/getopt/libgetopt.la \ $(top_builddir)/src/share/utf8/libutf8.la \ $(top_builddir)/src/libFLAC/libFLAC.la \ - @OGG_LIBS@ \ - @LIBICONV@ \ - -lm + @LIBICONV@ CLEANFILES = metaflac.exe diff --git a/src/plugin_xmms/Makefile.am b/src/plugin_xmms/Makefile.am index 84c41065..ffb76a17 100644 --- a/src/plugin_xmms/Makefile.am +++ b/src/plugin_xmms/Makefile.am @@ -60,7 +60,6 @@ libxmms_flac_la_LIBADD = \ $(top_builddir)/src/share/utf8/libutf8.la \ $(top_builddir)/src/libFLAC/libFLAC.la \ -L$(top_builddir)/src/libFLAC/.libs \ - @OGG_LIBS@ \ @XMMS_LIBS@ \ @LIBICONV@ libxmms_flac_la_LDFLAGS = -module -avoid-version diff --git a/src/test_grabbag/cuesheet/Makefile.am b/src/test_grabbag/cuesheet/Makefile.am index 2b240e12..b4d78249 100644 --- a/src/test_grabbag/cuesheet/Makefile.am +++ b/src/test_grabbag/cuesheet/Makefile.am @@ -26,8 +26,6 @@ test_cuesheet_SOURCES = \ test_cuesheet_LDADD = \ $(top_builddir)/src/share/grabbag/libgrabbag.la \ $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \ - $(top_builddir)/src/libFLAC/libFLAC.la \ - @OGG_LIBS@ \ - -lm + $(top_builddir)/src/libFLAC/libFLAC.la CLEANFILES = test_cuesheet.exe diff --git a/src/test_grabbag/picture/Makefile.am b/src/test_grabbag/picture/Makefile.am index d40eb689..d7e0c54f 100644 --- a/src/test_grabbag/picture/Makefile.am +++ b/src/test_grabbag/picture/Makefile.am @@ -26,8 +26,6 @@ test_picture_SOURCES = \ test_picture_LDADD = \ $(top_builddir)/src/share/grabbag/libgrabbag.la \ - $(top_builddir)/src/libFLAC/libFLAC.la \ - @OGG_LIBS@ \ - -lm + $(top_builddir)/src/libFLAC/libFLAC.la CLEANFILES = test_picture.exe diff --git a/src/test_seeking/Makefile.am b/src/test_seeking/Makefile.am index 806f3a15..55d0fe01 100644 --- a/src/test_seeking/Makefile.am +++ b/src/test_seeking/Makefile.am @@ -25,9 +25,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = test_seeking test_seeking_LDADD = \ - $(top_builddir)/src/libFLAC/libFLAC.la \ - @OGG_LIBS@ \ - -lm + $(top_builddir)/src/libFLAC/libFLAC.la test_seeking_SOURCES = \ main.c