summaryrefslogtreecommitdiff
path: root/gst-libs
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2008-05-08 16:04:32 +0000
committerEdward Hervey <bilboed@bilboed.com>2008-05-08 16:04:32 +0000
commit3bd052bef37d1347a2f6249bf019fd6f824dec9f (patch)
treefe586534856cf48926892b6f3dad24686582497e /gst-libs
parent811fa1a3ccea2809a1db707560e0c4c6fe0daacd (diff)
More fixes for make dist.
Original commit message from CVS: * configure.ac: * gst-libs/ext/Makefile.am: More fixes for make dist.
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/ext/Makefile.am7
1 files changed, 5 insertions, 2 deletions
diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
index ac16231..744667d 100644
--- a/gst-libs/ext/Makefile.am
+++ b/gst-libs/ext/Makefile.am
@@ -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