summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2009-01-27 19:35:19 +0100
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2009-01-28 13:02:50 +0100
commit1d1f55edf7ff2ae7324b5c5aac2c443dfd5436c3 (patch)
tree8c2b7ec359c5f21dea2bb4a078e039f594f99fca /Makefile.am
parent89c3c79d5e25f92fe7882e268b62b79288867f63 (diff)
Distribute intended ffmpeg revision(s) and include more files.
Bring make dist in sync with autogen.sh's retrieval of ffmpeg checkout, which also includes an update to selected revision of libswscale external. Also include *.S files (needed for e.g. ARM build).
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index cd36b136a7..56535cca46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,8 @@
DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
-SUBDIRS = $(FFMPEG_SUBDIRS) ext docs common tests
-DIST_SUBDIRS = $(SUBDIRS) gst-libs
+COMMON_SUBDIRS = ext docs common tests
+SUBDIRS = $(FFMPEG_SUBDIRS) $(COMMON_SUBDIRS)
+DIST_SUBDIRS = $(COMMON_SUBDIRS) gst-libs
# include before EXTRA_DIST for win32 assignment
include $(top_srcdir)/common/win32.mak