summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Coalson <jcoalson@users.sourceforce.net>2005-02-02 05:50:26 +0000
committerJosh Coalson <jcoalson@users.sourceforce.net>2005-02-02 05:50:26 +0000
commit1c00851aa7450e78bac0d9f66652e824e35198cf (patch)
tree01135d69cb909e3f4a40e0bcceeb117892dc2576
parent91ccea96f8a28a80ca6234a56957ac4176dc4e12 (diff)
downloadflac-1c00851aa7450e78bac0d9f66652e824e35198cf.tar.gz
need to link libiconv
-rw-r--r--src/plugin_xmms/Makefile.am3
-rw-r--r--src/plugin_xmms/Makefile.lite2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugin_xmms/Makefile.am b/src/plugin_xmms/Makefile.am
index bf1b78e3..a3a442b7 100644
--- a/src/plugin_xmms/Makefile.am
+++ b/src/plugin_xmms/Makefile.am
@@ -63,5 +63,6 @@ libxmms_flac_la_LIBADD = \
$(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
-L$(top_builddir)/src/libFLAC/.libs \
- @XMMS_LIBS@
+ @XMMS_LIBS@ \
+ @LIBICONV@
libxmms_flac_la_LDFLAGS = -module -avoid-version
diff --git a/src/plugin_xmms/Makefile.lite b/src/plugin_xmms/Makefile.lite
index 16aaf1d5..41c150cf 100644
--- a/src/plugin_xmms/Makefile.lite
+++ b/src/plugin_xmms/Makefile.lite
@@ -24,7 +24,7 @@ topdir = ../..
LIB_NAME = libxmms-flac
INCLUDES = $(shell xmms-config --cflags) -I./include -I$(topdir)/include -I..
# refer to the static libs explicitly
-LIBS = $(topdir)/obj/$(BUILD)/lib/libFLAC.a $(topdir)/obj/$(BUILD)/lib/libplugin_common.a $(topdir)/obj/$(BUILD)/lib/libgrabbag.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_analysis.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_synthesis.a -lstdc++ -lz
+LIBS = $(topdir)/obj/$(BUILD)/lib/libFLAC.a $(topdir)/obj/$(BUILD)/lib/libplugin_common.a $(topdir)/obj/$(BUILD)/lib/libgrabbag.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_analysis.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_synthesis.a -L$(ICONV_LIB_DIR) -liconv -lstdc++ -lz
SRCS_C = \
charset.c \