summaryrefslogtreecommitdiffstats
path: root/gst-libs/ext
diff options
context:
space:
mode:
authorChristian Schaller <uraeus@gnome.org>2003-09-12 12:56:55 +0000
committerChristian Schaller <uraeus@gnome.org>2003-09-12 12:56:55 +0000
commit22829859576f8d83d0e6c176e52d88f368b94c32 (patch)
tree3e90f5a3cb8e51b9adf801a75995173a416aa2a6 /gst-libs/ext
parentea73fdcfde59c4f90ce1bded08aacb47d4969b5c (diff)
downloadgst-plugins-bad-22829859576f8d83d0e6c176e52d88f368b94c32.tar.gz
gst-plugins-bad-22829859576f8d83d0e6c176e52d88f368b94c32.tar.bz2
gst-plugins-bad-22829859576f8d83d0e6c176e52d88f368b94c32.zip
build and disting fixes
Original commit message from CVS: build and disting fixes
Diffstat (limited to 'gst-libs/ext')
-rw-r--r--gst-libs/ext/ffmpeg/Makefile.am18
1 files changed, 6 insertions, 12 deletions
diff --git a/gst-libs/ext/ffmpeg/Makefile.am b/gst-libs/ext/ffmpeg/Makefile.am
index 83126dbe..90435815 100644
--- a/gst-libs/ext/ffmpeg/Makefile.am
+++ b/gst-libs/ext/ffmpeg/Makefile.am
@@ -1,5 +1,5 @@
# this doesn't trigger the distdir target in the ffmpeg checkout
-DIST_SUBDIRS =
+DIST_SUBDIR=
if USE_FFMPEG
FFMPEG_DIR=ffmpeg
@@ -18,24 +18,23 @@ PATCHES = patch/function.patch
patches:
@echo -n Patching ffmpeg if necessary ...
- @patch -p0 -N -r rejects < patch/function.patch > /dev/null || true
+ @patch -p0 -N -r rejects <$(srcdir)/patch/function.patch > /dev/null || true
@rm -f rejects || true
@echo done.
-SUBDIRS = $(FFMPEG_DIR)
+SUBDIRS =
-DISTFILES = \
+EXTRA_DIST = \
$(PATCHES) \
Tag \
- ffmpeg/COPYING \
+ ffmpeg/CVS
ffmpeg/CREDITS \
ffmpeg/INSTALL \
ffmpeg/README \
ffmpeg/VERSION \
ffmpeg/config.mak \
ffmpeg/configure \
- ffmpeg/Makefile \
ffmpeg/cygwin_inttypes.h \
ffmpeg/ffserver.h \
ffmpeg/ffmpeg.c \
@@ -57,18 +56,13 @@ DISTFILES = \
ffmpeg/libavcodec/ps2/*.h \
ffmpeg/libavcodec/*.c \
ffmpeg/libavcodec/*.h \
- ffmpeg/libavcodec/Makefile \
ffmpeg/libavformat/*.c \
ffmpeg/libavformat/*.h \
- ffmpeg/libavformat/Makefile \
- ffmpeg/tests/Makefile \
ffmpeg/tests/*.c \
ffmpeg/tests/*.ref \
ffmpeg/tests/*.sh \
ffmpeg/tests/test.conf \
- ffmpeg/vhook/*.c \
- ffmpeg/vhook/Makefile \
- Makefile.in
+ ffmpeg/vhook/*.c
checkout: