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.
This commit is contained in:
Víctor Manuel Jáquez Leal 2015-05-13 11:54:01 +02:00
parent ae95a72dd1
commit ef7dc4eaf6
5 changed files with 16 additions and 3 deletions

View file

@ -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)

View file

@ -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

View file

@ -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) \

View file

@ -62,6 +62,7 @@ libgstvaapi_source_c = \
$(NULL)
libgstvaapi_source_h = \
gstcompat.h \
gstvaapidecode.h \
gstvaapipluginbase.h \
gstvaapipluginutil.h \

View file

@ -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)