X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FlibFLAC%2FMakefile.am;h=aa0b8b634e52b9ec1b3b8e3591a6bf0991a80822;hb=2199d086921eb37d249cae0731f334556ec6209d;hp=13ab59306faf97c603375e08f2cbc17c4e26ff10;hpb=a43f56c0b22082834947485c24a329c07caa4ce6;p=platform%2Fupstream%2Fflac.git

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 13ab593..aa0b8b6 100644
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -34,6 +34,9 @@ noinst_LTLIBRARIES = libFLAC-static.la
 if DEBUG
 DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
 endif
+
+# FIXME: The following logic should be part of configure, not of Makefile.am
+
 if FLaC__CPU_PPC
 # The -force_cpusubtype_ALL is needed to insert a ppc64 instruction
 # into cpu.c with an asm().
@@ -79,7 +82,11 @@ endif
 endif
 endif
 
-libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ -lm
+if OS_IS_WINDOWS
+win_utf8_lib = $(top_builddir)/src/share/win_utf8_io/libwin_utf8_io.la
+endif
+
+libFLAC_la_LIBADD = $(win_utf8_lib) $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ -lm
 
 SUBDIRS = $(ARCH_SUBDIRS) include .
 
@@ -92,9 +99,7 @@ pkgconfig_DATA = flac.pc
 EXTRA_DIST = \
 	Makefile.lite \
 	flac.pc.in \
-	libFLAC_dynamic.dsp \
 	libFLAC_dynamic.vcproj \
-	libFLAC_static.dsp \
 	libFLAC_static.vcproj \
 	libFLAC.m4
 
@@ -105,6 +110,7 @@ extra_ogg_sources = \
 	ogg_helper.c \
 	ogg_mapping.c
 endif
+
 # see 'http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning' for numbering convention
 libFLAC_la_LDFLAGS = -version-info 11:0:3 $(LOCAL_EXTRA_LDFLAGS) @LT_NO_UNDEFINED@