Enable utf8 I/O stuff when compiling with MinGW.

[platform/upstream/flac.git] / src / libFLAC / Makefile.am

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 134168e..aa0b8b6 100644 (file)
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -30,9 +30,13 @@
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 lib_LTLIBRARIES = libFLAC.la
+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().
@@ -78,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 .
 
@@ -91,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
 
@@ -104,9 +110,11 @@ extra_ogg_sources = \
        ogg_helper.c \
        ogg_mapping.c
 endif
-# see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' for numbering convention
-libFLAC_la_LDFLAGS = -version-info 10:0:2 $(LOCAL_EXTRA_LDFLAGS) @LT_NO_UNDEFINED@
-libFLAC_la_SOURCES = \
+
+# 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@
+
+libFLAC_sources = \
        bitmath.c \
        bitreader.c \
        bitwriter.c \
@@ -125,3 +133,9 @@ libFLAC_la_SOURCES = \
        stream_encoder_framing.c \
        window.c \
        $(extra_ogg_sources)
+
+libFLAC_la_SOURCES = $(libFLAC_sources)
+
+# needed for test_libFLAC
+libFLAC_static_la_LIBADD = $(LOCAL_EXTRA_LIBADD)
+libFLAC_static_la_SOURCES = $(libFLAC_sources)