From 762db341097fb275acaac5b9030d25d4c659b10b Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Wed, 8 Jan 2003 16:41:27 +0000 Subject: merge back from release Original commit message from CVS: merge back from release --- gst-libs/ext/ffmpeg/Makefile.am | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gst-libs/ext') 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 \ -- cgit v1.2.1