diff options
author | Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com> | 2015-05-13 11:54:01 +0200 |
---|---|---|
committer | Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com> | 2015-05-13 15:21:07 +0200 |
commit | ef7dc4eaf6067f5086f43e1000f200d67004803c (patch) | |
tree | df07db9e00974212803e27537e55f9e83131c2d2 | |
parent | ae95a72dd1d4ecb17c5ccf91b5bda7217d370b8c (diff) |
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.
-rw-r--r-- | debian.upstream/Makefile.am | 1 | ||||
-rw-r--r-- | ext/libvpx/Makefile.am | 14 | ||||
-rw-r--r-- | gst-libs/gst/vaapi/Makefile.am | 2 | ||||
-rw-r--r-- | gst/vaapi/Makefile.am | 1 | ||||
-rw-r--r-- | tests/Makefile.am | 1 |
5 files changed, 16 insertions, 3 deletions
diff --git a/debian.upstream/Makefile.am b/debian.upstream/Makefile.am index 455ed082..e05a66d0 100644 --- a/debian.upstream/Makefile.am +++ b/debian.upstream/Makefile.am @@ -37,6 +37,7 @@ DEBIANGENFILES = \ EXTRA_DIST = $(DEBIANFILES) dist_noinst_DATA = $(DEBIANGENFILES) +DISTCLEANFILES = $(DEBIANGENFILES) # Extra clean files so that maintainer-clean removes *everything* MAINTAINERCLEANFILES = Makefile.in $(DEBIANGENFILES) 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 diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am index 4c3551e6..bb0123b6 100644 --- a/gst-libs/gst/vaapi/Makefile.am +++ b/gst-libs/gst/vaapi/Makefile.am @@ -118,7 +118,6 @@ libgstvaapi_source_h = \ libgstvaapi_source_priv_h = \ glibcompat.h \ - gstcompat.h \ gstvaapibufferproxy_priv.h \ gstvaapicodec_objects.h \ gstvaapicompat.h \ @@ -574,6 +573,7 @@ $(PKG_VERSION_FILE): $(NEW_VERSION_FILE) BUILT_SOURCES = gstvaapiversion.h EXTRA_DIST = gstvaapiversion.h.in $(PKG_VERSION_FILE) +DISTCLEANFILES = $(BUILT_SOURCES) EXTRA_DIST += \ $(libgstvaapi_enc_source_c) \ diff --git a/gst/vaapi/Makefile.am b/gst/vaapi/Makefile.am index d63f1684..0dd3c990 100644 --- a/gst/vaapi/Makefile.am +++ b/gst/vaapi/Makefile.am @@ -62,6 +62,7 @@ libgstvaapi_source_c = \ $(NULL) libgstvaapi_source_h = \ + gstcompat.h \ gstvaapidecode.h \ gstvaapipluginbase.h \ gstvaapipluginutil.h \ diff --git a/tests/Makefile.am b/tests/Makefile.am index fa1ee3a4..a852f409 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -132,6 +132,7 @@ simple_encoder_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) EXTRA_DIST = \ test-subpicture-data.h \ $(simple_decoder_source_h) \ + $(simple_encoder_source_h) \ $(test_utils_dec_source_h) \ $(test_utils_source_h) \ $(NULL) |