summaryrefslogtreecommitdiffstats
path: root/gst-libs
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2003-01-08 16:41:27 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2003-01-08 16:41:27 +0000
commit762db341097fb275acaac5b9030d25d4c659b10b (patch)
treed184a02ab61c03b68c8cc3d61d849b26bc22d871 /gst-libs
parent1f361e72b215de57e4c55994180882ca1de4b555 (diff)
downloadgst-plugins-bad-762db341097fb275acaac5b9030d25d4c659b10b.tar.gz
gst-plugins-bad-762db341097fb275acaac5b9030d25d4c659b10b.tar.bz2
gst-plugins-bad-762db341097fb275acaac5b9030d25d4c659b10b.zip
merge back from release
Original commit message from CVS: merge back from release
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/ext/ffmpeg/Makefile.am9
1 files changed, 8 insertions, 1 deletions
diff --git a/gst-libs/ext/ffmpeg/Makefile.am b/gst-libs/ext/ffmpeg/Makefile.am
index 1dd50de9..b2ace5f0 100644
--- a/gst-libs/ext/ffmpeg/Makefile.am
+++ b/gst-libs/ext/ffmpeg/Makefile.am
@@ -3,7 +3,13 @@ EXTRA_DIST = Tag
# this doesn't trigger the distdir target in the ffmpeg checkout
DIST_SUBDIRS =
-SUBDIRS = ffmpeg
+if USE_FFMPEG
+FFMPEG_DIR=ffmpeg
+else
+FFMPEG_DIR=
+endif
+
+SUBDIRS = $(FFMPEG_DIR)
DISTFILES = \
ffmpeg/Changelog \
@@ -16,6 +22,7 @@ DISTFILES = \
ffmpeg/configure \
ffmpeg/Makefile \
ffmpeg/cygwin_inttypes.h \
+ ffmpeg/ffserver.h \
ffmpeg/ffmpeg.c \
ffmpeg/ffserver.c \
ffmpeg/berrno.h \