Update and improve autotools build

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

diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
index ab8b4fb..d2c9f07 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  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
@@ -16,36 +16,41 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 bin_PROGRAMS = flac
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
-
-if FLaC__HAS_OGG
-NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la
-endif
 
+AM_CFLAGS = @OGG_CFLAGS@
+AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 EXTRA_DIST = \
        Makefile.lite \
-       Makefile.vc \
-       flac.dsp
+       Makefile.lite.iffscan \
+       flac.dsp \
+       flac.vcproj \
+       iffscan.c \
+       iffscan.dsp \
+       iffscan.vcproj
 
 flac_SOURCES = \
        analyze.c \
        decode.c \
        encode.c \
+       foreign_metadata.c \
        main.c \
+       local_string_utils.c \
        utils.c \
        vorbiscomment.c \
        analyze.h \
        decode.h \
        encode.h \
+       foreign_metadata.h \
+       local_string_utils.h \
        utils.h \
        vorbiscomment.h
 
 flac_LDADD = \
-       $(NEED_OGGFLAC_LIB) \
-       $(top_builddir)/src/share/grabbag/libgrabbag.a \
-       $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
+       $(top_builddir)/src/share/grabbag/libgrabbag.la \
        $(top_builddir)/src/share/getopt/libgetopt.a \
-       $(top_builddir)/src/share/utf8/libutf8.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@ \