7 files changed, 10 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index 316635480..17d477d5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2638,7 +2638,6 @@ src/libffmpeg/libavcodec/ppc/Makefile
 src/libffmpeg/libavcodec/sparc/Makefile
 src/libffmpeg/libavcodec/libpostproc/Makefile
 src/libffmpeg/libavutil/Makefile
-src/libflac/Makefile
 src/liblpcm/Makefile
 src/libmad/Makefile
 src/libmpeg2/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d5621593..df8e2d462 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,6 @@ SUBDIRS = \
 	libspeex \
 	libreal \
 	libfaad \
-	libflac \
         libmusepack \
 	post \
 	combined
diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
index 0d27f71c0..884fcf0cc 100644
--- a/src/combined/Makefile.am
+++ b/src/combined/Makefile.am
@@ -4,9 +4,18 @@ if HAVE_WAVPACK
 xineplug_wavpack = xineplug_wavpack.la
 endif
 
-xineplug_LTLIBRARIES = $(xineplug_wavpack)
+if HAVE_LIBFLAC
+xineplug_flac = xineplug_flac.la
+endif
+
+xineplug_LTLIBRARIES = $(xineplug_wavpack) $(xineplug_flac)
 
 xineplug_wavpack_la_SOURCES = demux_wavpack.c decoder_wavpack.c combined_wavpack.c combined_wavpack.h
 xineplug_wavpack_la_CFLAGS = $(VISIBILITY_FLAG) $(WAVPACK_CFLAGS) -I$(srcdir)/../demuxers
 xineplug_wavpack_la_LIBADD = $(XINE_LIB) $(WAVPACK_LIBS)
 xineplug_wavpack_la_LDFLAGS = $(xineplug_ldflags)
+
+xineplug_flac_la_SOURCES = demux_flac.c decoder_flac.c demux_flac.h
+xineplug_flac_la_CFLAGS = $(VISIBILITY_FLAG) $(LIBFLAC_CFLAGS)
+xineplug_flac_la_LIBADD = $(XINE_LIB) $(LIBFLAC_LIBS)
+xineplug_flac_la_LDFLAGS = $(xineplug_ldflags)
diff --git a/src/libflac/decoder_flac.c b/src/combined/decoder_flac.c
index 9b77cc27d..9b77cc27d 100644
--- a/src/libflac/decoder_flac.c
+++ b/src/combined/decoder_flac.c
diff --git a/src/libflac/demux_flac.c b/src/combined/demux_flac.c
index 43ee17d5c..43ee17d5c 100644
--- a/src/libflac/demux_flac.c
+++ b/src/combined/demux_flac.c
diff --git a/src/libflac/demux_flac.h b/src/combined/demux_flac.h
index 6086781d1..6086781d1 100644
--- a/src/libflac/demux_flac.h
+++ b/src/combined/demux_flac.h
diff --git a/src/libflac/Makefile.am b/src/libflac/Makefile.am
deleted file mode 100644
index 6449820bc..000000000
--- a/src/libflac/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include $(top_srcdir)/misc/Makefile.common
-
-libdir = $(XINE_PLUGINDIR)
-
-if HAVE_LIBFLAC
-lib_LTLIBRARIES = xineplug_flac.la
-endif
-
-xineplug_flac_la_SOURCES = demux_flac.c decoder_flac.c
-xineplug_flac_la_LIBADD = $(LIBFLAC_LIBS) $(XINE_LIB)
-xineplug_flac_la_CFLAGS = $(LIBFLAC_CFLAGS) $(VISIBILITY_FLAG)
-xineplug_flac_la_LDFLAGS = -avoid-version -module
-
-noinst_HEADERS = demux_flac.h