From ef7dc4eaf6067f5086f43e1000f200d67004803c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Wed, 13 May 2015 11:54:01 +0200 Subject: build: fix make distcheck This patch fixes several issues found when running the `make distcheck` target: - In commit c561b8da, the update of gstcompat.h in Makefile.am was forgotten. - In commit c5756a91 add the simple_encoder_source_h in EXTRA_DIST was forgotten. - vpx.build.stamp is not generated at all, only vpx.configure.stamp. - The make target distcleancheck failed because some autogenerated files were not handled with the DISTCLEANFILES variable. Note: `make distcheck -jXX` is not currently supported. --- ext/libvpx/Makefile.am | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'ext/libvpx') diff --git a/ext/libvpx/Makefile.am b/ext/libvpx/Makefile.am index f945dce6..793026ec 100644 --- a/ext/libvpx/Makefile.am +++ b/ext/libvpx/Makefile.am @@ -69,11 +69,21 @@ vpx.build: vpx.configure.stamp vpx.clean: @[ -d $(vpx_builddir) ] && \ $(MAKE) -C $(vpx_builddir) clean || : - rm -f vpx.build.stamp vpx.configure.stamp + rm -f vpx.configure.stamp vpx.maintainer.clean: vpx.clean rm -rf $(vpx_builddir) +DISTCLEANFILES = \ + $(vpx_builddir)/config.mk \ + $(vpx_builddir)/config.log \ + $(vpx_builddir)/libs-x86_64-linux-gcc.mk \ + $(vpx_builddir)/Makefile \ + $(vpx_builddir)/vpx_config.c \ + $(vpx_builddir)/vpx_config.h \ + $(vpx_builddir)/vpx_config.asm \ + $(NULL) + vpx.configure.stamp: @[ -d $(vpx_builddir) ] || mkdir $(vpx_builddir); \ cd $(vpx_builddir) ; \ @@ -97,7 +107,7 @@ vpx.configure.stamp: $(gst_vpx_source_c): vpx.build -CLEANFILES = vpx.build.stamp +CLEANFILES = vpx.configure.stamp # Files for packaging include $(srcdir)/sources.frag -- cgit v1.2.1