mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

More fixes for make dist.

Browse source 
Original commit message from CVS:
* configure.ac:
* gst-libs/ext/Makefile.am:
More fixes for make dist.
This commit is contained in:
Edward Hervey 2008-05-08 16:04:32 +00:00
parent 811fa1a3cc
commit 3bd052bef3
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
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> 2008-05-08 Edward Hervey <edward.hervey@collabora.co.uk>
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_img_convert): * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_img_convert):

2
configure.ac
View file

@ -249,7 +249,7 @@ if test "x$with_system_ffmpeg" = "xyes"; then
sleep 15 sleep 15
else else
source ./ffmpegrev source "$srcdir/ffmpegrev"
AC_MSG_NOTICE([Using ffmpeg revision $FFMPEG_REVISION]) AC_MSG_NOTICE([Using ffmpeg revision $FFMPEG_REVISION])

7
gst-libs/ext/Makefile.am
View file

@ -11,7 +11,7 @@
SUBDIRS = SUBDIRS =
DIST_SUBDIRS = ffmpeg DIST_SUBDIRS = ffmpeg
TMP_DIST_DIR=ffmpeg-dist TMP_DIST_DIR=ffmpeg-dist
DIST_DIR=$(TMP_DIST_DIR)/.ffmpeg DIST_DIR=$(TMP_DIST_DIR)/.ffmpeg/
all-local: all-local:
cd ffmpeg && $(MAKE) cd ffmpeg && $(MAKE)
@ -22,12 +22,14 @@ clean-local:
dist-clean: dist-clean:
rm -rf $(TMP_DIST_DIR) rm -rf $(TMP_DIST_DIR)
distclean: dist-clean
dist-local: dist-clean dist-local: dist-clean
svn -r $(FFMPEG_REVISION) co $(FFMPEG_SVN) $(TMP_DIST_DIR) svn -r $(FFMPEG_REVISION) co $(FFMPEG_SVN) $(TMP_DIST_DIR)
mkdir $(DIST_DIR) mkdir $(DIST_DIR)
pwd 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)/*.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) cp $(TMP_DIST_DIR)/Doxyfile $(TMP_DIST_DIR)/CREDITS $(TMP_DIST_DIR)/MAINTAINERS $(DIST_DIR)
@for d in `cd $(TMP_DIST_DIR) && ls -d */`; \ @for d in `cd $(TMP_DIST_DIR) && ls -d */`; \
do mkdir $(DIST_DIR)/$$d; \ do mkdir $(DIST_DIR)/$$d; \
@ -41,6 +43,7 @@ dist-local: dist-clean
done done
rm -rf ffmpeg rm -rf ffmpeg
mv $(DIST_DIR) ffmpeg mv $(DIST_DIR) ffmpeg
touch ffmpeg/config.mak
echo "Patching ffmpeg ./configure" echo "Patching ffmpeg ./configure"
sed -e '/Unknown option/ {N;N;s/exit 1//; }' ffmpeg/configure > ffmpeg/configure.tmp sed -e '/Unknown option/ {N;N;s/exit 1//; }' ffmpeg/configure > ffmpeg/configure.tmp
mv ffmpeg/configure.tmp ffmpeg/configure mv ffmpeg/configure.tmp ffmpeg/configure