diff options
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | gst-libs/ext/ffmpeg/Makefile.am | 55 |
2 files changed, 58 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index f2761ff1..6c5ae33e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,8 @@ else EXAMPLES_DIR= endif -all-local: gstreamer-libs-@GST_MAJORMINOR@.pc gstreamer-play-@GST_MAJORMINOR@.pc gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc +all-local: gstreamer-libs-@GST_MAJORMINOR@.pc gstreamer-play-@GST_MAJORMINOR@.pc gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc gst-element-check-@GST_MAJORMINOR@.m4 + gstreamer-libs-@GST_MAJORMINOR@.pc: gstreamer-libs.pc gstreamer-libs.pc.in cp gstreamer-libs.pc gstreamer-libs-@GST_MAJORMINOR@.pc gstreamer-play-@GST_MAJORMINOR@.pc: gstreamer-play.pc gstreamer-play.pc.in @@ -26,7 +27,7 @@ gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc: gstreamer-libs-uninstalled.pc gs gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc: gstreamer-play-uninstalled.pc gstreamer-play-uninstalled.pc.in cp gstreamer-play-uninstalled.pc gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4 - cp gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4 + cp $(srcdir)/gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ diff --git a/gst-libs/ext/ffmpeg/Makefile.am b/gst-libs/ext/ffmpeg/Makefile.am index e264d24e..48fd2b34 100644 --- a/gst-libs/ext/ffmpeg/Makefile.am +++ b/gst-libs/ext/ffmpeg/Makefile.am @@ -1,9 +1,64 @@ REVISION = +# this doesn't trigger the distdir target in the ffmpeg checkout +DIST_SUBDIRS = + SUBDIRS = ffmpeg +DISTFILES = \ + ffmpeg/Changelog \ + ffmpeg/COPYING \ + ffmpeg/CREDITS \ + ffmpeg/INSTALL \ + ffmpeg/README \ + ffmpeg/VERSION \ + ffmpeg/config.mak \ + ffmpeg/configure \ + ffmpeg/Makefile \ + ffmpeg/cygwin_inttypes.h \ + ffmpeg/ffmpeg.c \ + ffmpeg/ffserver.c \ + ffmpeg/berrno.h \ + ffmpeg/libavcodec/alpha/*.c \ + ffmpeg/libavcodec/alpha/*.h \ + ffmpeg/libavcodec/alpha/*.S \ + ffmpeg/libavcodec/armv4l/*.c \ + ffmpeg/libavcodec/armv4l/*.S \ + ffmpeg/libavcodec/i386/*.c \ + ffmpeg/libavcodec/i386/*.h \ + ffmpeg/libavcodec/liba52/*.c \ + ffmpeg/libavcodec/liba52/*.h \ + ffmpeg/libavcodec/ppc/*.c \ + ffmpeg/libavcodec/ppc/*.h \ + ffmpeg/libavcodec/ps2/*.c \ + ffmpeg/libavcodec/ps2/*.h \ + ffmpeg/libavcodec/*.c \ + ffmpeg/libavcodec/*.h \ + ffmpeg/libavcodec/Makefile \ + ffmpeg/libavformat/*.c \ + ffmpeg/libavformat/*.h \ + ffmpeg/libavformat/Makefile \ + ffmpeg/tests/Makefile \ + ffmpeg/tests/*.c \ + ffmpeg/tests/*.ref \ + ffmpeg/tests/*.sh \ + ffmpeg/tests/test.conf \ + ffmpeg/vhook/*.c \ + ffmpeg/vhook/Makefile \ + Makefile.in + + checkout: cvs -d:pserver:anonymous@cvs.ffmpeg.sourceforge.net:/cvsroot/ffmpeg co ffmpeg +# on running make install, make sure make has been run first install: cd ffmpeg && make + +# override recursive targets +dvi-recursive: + true +check-recursive: + true +installcheck-recursive: + true |