Change order of flac_LDADD libs so it works with mingw.

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

diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
index 638cd74..6d6be71 100644 (file)
--- a/src/flac/Makefile.am
+++ b/src/flac/Makefile.am
@@ -1,5 +1,5 @@
 #  flac - Command-line FLAC encoder/decoder
-#  Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
+#  Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 bin_PROGRAMS = flac
 
 AM_CFLAGS = @OGG_CFLAGS@
-
+AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 EXTRA_DIST = \
        Makefile.lite \
        Makefile.lite.iffscan \
@@ -46,13 +46,12 @@ flac_SOURCES = \
        vorbiscomment.h
 
 flac_LDADD = \
+       $(top_builddir)/src/share/utf8/libutf8.la \
        $(top_builddir)/src/share/grabbag/libgrabbag.la \
        $(top_builddir)/src/share/getopt/libgetopt.a \
        $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
        $(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
-       $(top_builddir)/src/share/utf8/libutf8.la \
        $(top_builddir)/src/libFLAC/libFLAC.la \
        @OGG_LIBS@ \
        @LIBICONV@ \
-       @MINGW_WINSOCK_LIBS@ \
        -lm