From 1110a6d41032d94dc5a7801ed02d82df5d31a0dc Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 25 Oct 2008 20:59:36 +0200 Subject: removed internal copy of libmp4ff MPD shouldn't integrate sources of other libraries. Since libmp4ff is part of libfaad, we should remove the old copy from src/mp4ff and link with the current version from libfaad instead. --- src/Makefile.am | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 35a4d2b62..967dfb861 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,4 @@ bin_PROGRAMS = mpd -SUBDIRS = $(MP4FF_SUBDIR) mpd_audioOutputs = \ audioOutputs/audioOutput_shout.c \ @@ -258,7 +257,7 @@ mpd_CPPFLAGS = \ $(MAD_CFLAGS) \ $(FFMPEG_CFLAGS) \ $(GLIB_CFLAGS) -mpd_LDADD = $(MPD_LIBS) $(MP4FF_LIB) \ +mpd_LDADD = $(MPD_LIBS) \ $(AO_LIBS) $(ALSA_LIBS) \ $(SHOUT_LIBS) \ $(OGGVORBIS_LIBS) $(VORBISENC_LIBS) $(FLAC_LIBS) \ @@ -268,8 +267,6 @@ mpd_LDADD = $(MPD_LIBS) $(MP4FF_LIB) \ $(FFMPEG_LIBS) \ $(GLIB_LIBS) -DIST_SUBDIRS = mp4ff - # sparse is a semantic parser # URL: git://www.kernel.org/pub/scm/devel/sparse/sparse.git SPARSE = sparse -- cgit v1.2.3