aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-25 20:59:36 +0200
committerMax Kellermann <max@duempel.org>2008-10-25 20:59:36 +0200
commit1110a6d41032d94dc5a7801ed02d82df5d31a0dc (patch)
treeb81a8c4a0ba9cf9ff4ab65a249871833fae8ca76 /src/Makefile.am
parenta02db572919c7b7c21e023f45d3d11feaae4f54e (diff)
downloadmpd-1110a6d41032d94dc5a7801ed02d82df5d31a0dc.tar.gz
mpd-1110a6d41032d94dc5a7801ed02d82df5d31a0dc.tar.xz
mpd-1110a6d41032d94dc5a7801ed02d82df5d31a0dc.zip
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.
Diffstat (limited to '')
-rw-r--r--src/Makefile.am5
1 files changed, 1 insertions, 4 deletions
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