diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2003-01-08 16:41:27 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2003-01-08 16:41:27 +0000 |
| commit | 346d1228b9e94130b8160eccf6cd29717d4029bb (patch) | |
| tree | d56fc31b559be0a77e35b53008f9f3599a711cb8 /gst-libs/ext | |
| parent | 7dc8ac4b51bae99dc03378b7c7c5d17a89eaa909 (diff) | |
merge back from release
Original commit message from CVS:
merge back from release
Diffstat (limited to 'gst-libs/ext')
| -rw-r--r-- | gst-libs/ext/ffmpeg/Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gst-libs/ext/ffmpeg/Makefile.am b/gst-libs/ext/ffmpeg/Makefile.am index 1dd50de90..b2ace5f06 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 \ |