mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 04:26:14 +00:00
build and disting fixes
Original commit message from CVS: build and disting fixes
This commit is contained in:
parent
ea73fdcfde
commit
2282985957
1 changed files with 6 additions and 12 deletions
|
@ -1,5 +1,5 @@
|
||||||
# this doesn't trigger the distdir target in the ffmpeg checkout
|
# this doesn't trigger the distdir target in the ffmpeg checkout
|
||||||
DIST_SUBDIRS =
|
DIST_SUBDIR=
|
||||||
|
|
||||||
if USE_FFMPEG
|
if USE_FFMPEG
|
||||||
FFMPEG_DIR=ffmpeg
|
FFMPEG_DIR=ffmpeg
|
||||||
|
@ -18,24 +18,23 @@ PATCHES = patch/function.patch
|
||||||
|
|
||||||
patches:
|
patches:
|
||||||
@echo -n Patching ffmpeg if necessary ...
|
@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
|
@rm -f rejects || true
|
||||||
@echo done.
|
@echo done.
|
||||||
|
|
||||||
|
|
||||||
SUBDIRS = $(FFMPEG_DIR)
|
SUBDIRS =
|
||||||
|
|
||||||
DISTFILES = \
|
EXTRA_DIST = \
|
||||||
$(PATCHES) \
|
$(PATCHES) \
|
||||||
Tag \
|
Tag \
|
||||||
ffmpeg/COPYING \
|
ffmpeg/CVS
|
||||||
ffmpeg/CREDITS \
|
ffmpeg/CREDITS \
|
||||||
ffmpeg/INSTALL \
|
ffmpeg/INSTALL \
|
||||||
ffmpeg/README \
|
ffmpeg/README \
|
||||||
ffmpeg/VERSION \
|
ffmpeg/VERSION \
|
||||||
ffmpeg/config.mak \
|
ffmpeg/config.mak \
|
||||||
ffmpeg/configure \
|
ffmpeg/configure \
|
||||||
ffmpeg/Makefile \
|
|
||||||
ffmpeg/cygwin_inttypes.h \
|
ffmpeg/cygwin_inttypes.h \
|
||||||
ffmpeg/ffserver.h \
|
ffmpeg/ffserver.h \
|
||||||
ffmpeg/ffmpeg.c \
|
ffmpeg/ffmpeg.c \
|
||||||
|
@ -57,18 +56,13 @@ DISTFILES = \
|
||||||
ffmpeg/libavcodec/ps2/*.h \
|
ffmpeg/libavcodec/ps2/*.h \
|
||||||
ffmpeg/libavcodec/*.c \
|
ffmpeg/libavcodec/*.c \
|
||||||
ffmpeg/libavcodec/*.h \
|
ffmpeg/libavcodec/*.h \
|
||||||
ffmpeg/libavcodec/Makefile \
|
|
||||||
ffmpeg/libavformat/*.c \
|
ffmpeg/libavformat/*.c \
|
||||||
ffmpeg/libavformat/*.h \
|
ffmpeg/libavformat/*.h \
|
||||||
ffmpeg/libavformat/Makefile \
|
|
||||||
ffmpeg/tests/Makefile \
|
|
||||||
ffmpeg/tests/*.c \
|
ffmpeg/tests/*.c \
|
||||||
ffmpeg/tests/*.ref \
|
ffmpeg/tests/*.ref \
|
||||||
ffmpeg/tests/*.sh \
|
ffmpeg/tests/*.sh \
|
||||||
ffmpeg/tests/test.conf \
|
ffmpeg/tests/test.conf \
|
||||||
ffmpeg/vhook/*.c \
|
ffmpeg/vhook/*.c
|
||||||
ffmpeg/vhook/Makefile \
|
|
||||||
Makefile.in
|
|
||||||
|
|
||||||
|
|
||||||
checkout:
|
checkout:
|
||||||
|
|
Loading…
Reference in a new issue