Commit ca56e93b authored by Matt Zimmerman's avatar Matt Zimmerman
Browse files

Build libtool archives instead of plain .a archives, so that PIC versions are

built and can they be portably linked into shared libraries.
parent e8a7601a
......@@ -19,4 +19,4 @@
hacks=true
#
aclocal && autoconf && autoheader && $hacks && automake --foreign --include-deps --add-missing --copy
aclocal-1.6 && autoconf && autoheader && $hacks && automake-1.6 --foreign --include-deps --add-missing --copy
......@@ -41,10 +41,10 @@ flac_SOURCES = \
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/grabbag/libgrabbag.la \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
$(top_builddir)/src/share/getopt/libgetopt.a \
$(top_builddir)/src/share/utf8/libutf8.a \
$(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \
@LIBICONV@ \
......
......@@ -39,10 +39,10 @@ metaflac_SOURCES = \
metaflac_LDFLAGS =
metaflac_LDADD = \
$(top_builddir)/src/share/grabbag/libgrabbag.a \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
$(top_builddir)/src/share/getopt/libgetopt.a \
$(top_builddir)/src/share/utf8/libutf8.a \
$(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
@LIBICONV@ \
-lm
......@@ -6,7 +6,7 @@ SUBDIRS = include .
INCLUDES = -I$(top_srcdir)/include @ID3LIB_CFLAGS@
noinst_LIBRARIES = libplugin_common.a
noinst_LTLIBRARIES = libplugin_common.la
noinst_HEADERS = \
all.h \
......@@ -20,7 +20,7 @@ noinst_HEADERS = \
replaygain_synthesis.h \
vorbiscomment.h
libplugin_common_a_SOURCES = \
libplugin_common_la_SOURCES = \
canonical_tag.c \
charset.c \
dither.c \
......
......@@ -57,10 +57,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 = \
$(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/plugin_common/libplugin_common.la \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
$(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
-L$(top_builddir)/src/libFLAC/.libs \
@XMMS_LIBS@ \
......
......@@ -4,9 +4,9 @@ AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir)/include/share
noinst_LIBRARIES = libgain_analysis.a
noinst_LTLIBRARIES = libgain_analysis.la
libgain_analysis_a_SOURCES = gain_analysis.c
libgain_analysis_la_SOURCES = gain_analysis.c
EXTRA_DIST = \
Makefile.lite \
......
......@@ -4,9 +4,9 @@ AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir)/include
noinst_LIBRARIES = libgrabbag.a
noinst_LTLIBRARIES = libgrabbag.la
libgrabbag_a_SOURCES = \
libgrabbag_la_SOURCES = \
cuesheet.c \
file.c \
replaygain.c \
......
......@@ -4,9 +4,9 @@ AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir)/include/share
noinst_LIBRARIES = libutf8.a
noinst_LTLIBRARIES = libutf8.la
libutf8_a_SOURCES = charset.c charset.h iconvert.c utf8.c
libutf8_la_SOURCES = charset.c charset.h iconvert.c utf8.c
EXTRA_DIST = \
Makefile.lite \
......
......@@ -25,8 +25,8 @@ noinst_PROGRAMS = test_cuesheet
test_cuesheet_SOURCES = \
main.c
test_cuesheet_LDADD = \
$(top_builddir)/src/share/grabbag/libgrabbag.a \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
-lm
......
......@@ -24,8 +24,8 @@ EXTRA_DIST = \
noinst_PROGRAMS = test_libFLAC++
test_libFLAC___LDADD = \
$(top_builddir)/src/share/grabbag/libgrabbag.a \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
$(top_builddir)/src/libFLAC++/libFLAC++.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
-lm
......
......@@ -24,8 +24,8 @@ INCLUDES = -I$(top_srcdir)/src/libFLAC/include
noinst_PROGRAMS = test_libFLAC
test_libFLAC_LDADD = \
$(top_builddir)/src/share/grabbag/libgrabbag.a \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
-lm
test_libFLAC_SOURCES = \
......
......@@ -24,8 +24,8 @@ CFLAGS = @CFLAGS@ @OGG_CFLAGS@
noinst_PROGRAMS = test_libOggFLAC++
test_libOggFLAC___LDADD = \
$(top_builddir)/src/share/grabbag/libgrabbag.a \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
$(top_builddir)/src/libOggFLAC++/libOggFLAC++.la \
$(top_builddir)/src/libOggFLAC/libOggFLAC.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
......
......@@ -24,8 +24,8 @@ INCLUDES =
noinst_PROGRAMS = test_libOggFLAC
test_libOggFLAC_LDADD = \
$(top_builddir)/src/share/grabbag/libgrabbag.a \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
$(top_builddir)/src/libOggFLAC/libOggFLAC.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment