From 87324f82f0a259a4067a61f03ce1dafc619a7a5b Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Thu, 11 Mar 2004 18:21:34 +0000 Subject: [PATCH] alright ! ready to test. Original commit message from CVS: alright ! ready to test. need to write up how to manage the source now though --- ChangeLog | 4 ++++ gst-libs/ext/Makefile.am | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5225b72..d1fdc72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-03-11 Thomas Vander Stichele + + * configure.ac: use new setup with mirrored cvs tree + 2004-03-10 David Schleef * gst-libs/ext/ffmpeg/patch/asm.diff: Add a patch that diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am index b91d01c..883c664 100644 --- a/gst-libs/ext/Makefile.am +++ b/gst-libs/ext/Makefile.am @@ -1,3 +1,13 @@ +# we have to put in a little hack here for integration to work well +# ffmpeg can't be in SUBDIRS, because then automake will try to descend in it +# and find conditionals it doesn't know. + +# so, +# - don't put it in SUBDIRS so automake doesn't descend +# - put it in DIST_SUBDIRS so make dist picks up the subtree +# - add an all-local hook so it does get built +# this also satisfies make distcheck + SUBDIRS = DIST_SUBDIRS = ffmpeg -- 2.7.4