oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Pass glib libs properly to libtool.

Browse Source 
Passing libraries through LDFLAGS is a mistake that causes link to fail
when using --as-needed. Since the ld arguments are positional, so are
libtool's. Use the proper variable, thus, to pass the libraries.
This commit is contained in:
Diego Elio 'Flameeyes' Pettenò 2009-03-11 12:38:25 +01:00 committed by Max Kellermann
parent bc3702a4fd
commit ce6ef89f26
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.am
View File

@ -2,7 +2,6 @@ ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign 1.9 dist-bzip2 AUTOMAKE_OPTIONS = foreign 1.9 dist-bzip2
AM_CPPFLAGS = -I$(srcdir)/src $(GLIB_CFLAGS) AM_CPPFLAGS = -I$(srcdir)/src $(GLIB_CFLAGS)
AM_LDFLAGS = $(GLIB_LIBS)
bin_PROGRAMS = src/mpd bin_PROGRAMS = src/mpd
@ -20,7 +19,8 @@ src_mpd_LDADD = $(MPD_LIBS) \
$(INPUT_LIBS) \ $(INPUT_LIBS) \
$(DECODER_LIBS) \ $(DECODER_LIBS) \
$(ENCODER_LIBS) \ $(ENCODER_LIBS) \
$(OUTPUT_LIBS) $(OUTPUT_LIBS) \
$(GLIB_LIBS)
mpd_headers = \ mpd_headers = \
src/notify.h \ src/notify.h \
@ -539,7 +539,8 @@ test_run_decoder_CPPFLAGS = $(AM_CPPFLAGS) \
$(INPUT_CFLAGS) $(DECODER_CFLAGS) $(INPUT_CFLAGS) $(DECODER_CFLAGS)
test_run_decoder_LDADD = $(MPD_LIBS) \ test_run_decoder_LDADD = $(MPD_LIBS) \
$(ID3TAG_LIBS) \ $(ID3TAG_LIBS) \
$(INPUT_LIBS) $(DECODER_LIBS) $(INPUT_LIBS) $(DECODER_LIBS) \
$(GLIB_LIBS)
test_run_decoder_SOURCES = test/run_decoder.c \ test_run_decoder_SOURCES = test/run_decoder.c \
src/conf.c src/buffer2array.c src/utils.c src/log.c \ src/conf.c src/buffer2array.c src/utils.c src/log.c \
src/tag.c src/tag_pool.c \ src/tag.c src/tag_pool.c \
@ -554,7 +555,8 @@ test_read_tags_CPPFLAGS = $(AM_CPPFLAGS) \
$(INPUT_CFLAGS) $(DECODER_CFLAGS) $(INPUT_CFLAGS) $(DECODER_CFLAGS)
test_read_tags_LDADD = $(MPD_LIBS) \ test_read_tags_LDADD = $(MPD_LIBS) \
$(ID3TAG_LIBS) \ $(ID3TAG_LIBS) \
$(INPUT_LIBS) $(DECODER_LIBS) $(INPUT_LIBS) $(DECODER_LIBS) \
$(GLIB_LIBS)
test_read_tags_SOURCES = test/read_tags.c \ test_read_tags_SOURCES = test/read_tags.c \
src/conf.c src/buffer2array.c src/utils.c src/log.c \ src/conf.c src/buffer2array.c src/utils.c src/log.c \
src/tag.c src/tag_pool.c src/tag_ape.c \ src/tag.c src/tag_pool.c src/tag_ape.c \
@ -570,7 +572,8 @@ test_run_encoder_SOURCES = test/run_encoder.c \
src/audio_parser.c \ src/audio_parser.c \
$(ENCODER_SRC) $(ENCODER_SRC)
test_run_encoder_LDADD = $(MPD_LIBS) \ test_run_encoder_LDADD = $(MPD_LIBS) \
$(ENCODER_LIBS) $(ENCODER_LIBS) \
$(GLIB_LIBS)
test_software_volume_SOURCES = test/software_volume.c \ test_software_volume_SOURCES = test/software_volume.c \
src/audio_parser.c \ src/audio_parser.c \
@ -581,7 +584,8 @@ test_run_output_CPPFLAGS = $(AM_CPPFLAGS) \
$(OUTPUT_CFLAGS) $(OUTPUT_CFLAGS)
test_run_output_LDADD = $(MPD_LIBS) \ test_run_output_LDADD = $(MPD_LIBS) \
$(ENCODER_LIBS) \ $(ENCODER_LIBS) \
$(OUTPUT_LIBS) $(OUTPUT_LIBS) \
$(GLIB_LIBS)
test_run_output_SOURCES = test/run_output.c \ test_run_output_SOURCES = test/run_output.c \
src/conf.c src/buffer2array.c src/utils.c src/log.c \ src/conf.c src/buffer2array.c src/utils.c src/log.c \
src/audio_parser.c \ src/audio_parser.c \