Commit 3bd052be authored by Edward Hervey's avatar Edward Hervey 🤘

More fixes for make dist.

Original commit message from CVS:
* configure.ac:
* gst-libs/ext/Makefile.am:
More fixes for make dist.
parent 811fa1a3
2008-05-08 Edward Hervey <edward.hervey@collabora.co.uk>
* configure.ac:
* gst-libs/ext/Makefile.am:
More fixes for make dist.
2008-05-08 Edward Hervey <edward.hervey@collabora.co.uk>
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_img_convert):
......
......@@ -249,7 +249,7 @@ if test "x$with_system_ffmpeg" = "xyes"; then
sleep 15
else
source ./ffmpegrev
source "$srcdir/ffmpegrev"
AC_MSG_NOTICE([Using ffmpeg revision $FFMPEG_REVISION])
......
......@@ -11,7 +11,7 @@
SUBDIRS =
DIST_SUBDIRS = ffmpeg
TMP_DIST_DIR=ffmpeg-dist
DIST_DIR=$(TMP_DIST_DIR)/.ffmpeg
DIST_DIR=$(TMP_DIST_DIR)/.ffmpeg/
all-local:
cd ffmpeg && $(MAKE)
......@@ -22,12 +22,14 @@ clean-local:
dist-clean:
rm -rf $(TMP_DIST_DIR)
distclean: dist-clean
dist-local: dist-clean
svn -r $(FFMPEG_REVISION) co $(FFMPEG_SVN) $(TMP_DIST_DIR)
mkdir $(DIST_DIR)
pwd
cp $(TMP_DIST_DIR)/*.c $(TMP_DIST_DIR)/*.h $(TMP_DIST_DIR)/Makefile $(TMP_DIST_DIR)/configure $(TMP_DIST_DIR)/version.sh $(DIST_DIR)
cp $(TMP_DIST_DIR)/common.mak $(TMP_DIST_DIR)/Changelog $(TMP_DIST_DIR)/COPYING.* $(TMP_DIST_DIR)/INSTALL $(DIST_DIR)
cp $(TMP_DIST_DIR)/*.mak $(TMP_DIST_DIR)/Changelog $(TMP_DIST_DIR)/COPYING.* $(TMP_DIST_DIR)/INSTALL $(DIST_DIR)
cp $(TMP_DIST_DIR)/Doxyfile $(TMP_DIST_DIR)/CREDITS $(TMP_DIST_DIR)/MAINTAINERS $(DIST_DIR)
@for d in `cd $(TMP_DIST_DIR) && ls -d */`; \
do mkdir $(DIST_DIR)/$$d; \
......@@ -41,6 +43,7 @@ dist-local: dist-clean
done
rm -rf ffmpeg
mv $(DIST_DIR) ffmpeg
touch ffmpeg/config.mak
echo "Patching ffmpeg ./configure"
sed -e '/Unknown option/ {N;N;s/exit 1//; }' ffmpeg/configure > ffmpeg/configure.tmp
mv ffmpeg/configure.tmp ffmpeg/configure
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment