build: fix make dist with certain conditionals not met.

Fix generation of source tarballs when certain conditionals are not
met. e.g. always include all buildable codecparsers sources in the
distribution tarball, fix plug-in element sources set to include X11
and encoder bits.

diff --git a/gst-libs/gst/codecparsers/Makefile.am b/gst-libs/gst/codecparsers/Makefile.am
index ecd2f5e..1feb241 100644 (file)
--- a/gst-libs/gst/codecparsers/Makefile.am
+++ b/gst-libs/gst/codecparsers/Makefile.am
@@ -98,9 +98,39 @@ $(gen_source_h): %.h: $(local_codecparsers_srcdir)/%.h
 $(top_builddir)/ext/libvpx/libgstcodecparsers_vpx.la:
        $(MAKE) -C $(top_builddir)/ext/libvpx
 
+# All sources and headers that could be used here
+all_source_c = \
+       dboolhuff.c                             \
+       gsth264parser.c                         \
+       gstjpegparser.c                         \
+       gstmpeg4parser.c                        \
+       gstmpegvideoparser.c                    \
+       gstvaapilibvpx.c                        \
+       gstvc1parser.c                          \
+       gstvp8parser.c                          \
+       gstvp8rangedecoder.c                    \
+       nalutils.c                              \
+       parserutils.c                           \
+       vp8utils.c                              \
+       $(NULL)
+
+all_source_h = \
+       dboolhuff.h                             \
+       gsth264parser.h                         \
+       gstjpegparser.h                         \
+       gstmpeg4parser.h                        \
+       gstmpegvideoparser.h                    \
+       gstvc1parser.h                          \
+       gstvp8parser.h                          \
+       gstvp8rangedecoder.h                    \
+       nalutils.h                              \
+       parserutils.h                           \
+       vp8utils.h                              \
+       $(NULL)
+
 EXTRA_DIST = \
-       $(add_source_c) \
-       $(add_source_h) \
+       $(all_source_c) \
+       $(all_source_h) \
        $(NULL)
 
 DISTCLEANFILES = $(GENFILES) .timestamp.symlinks

diff --git a/gst/vaapi/Makefile.am b/gst/vaapi/Makefile.am
index 9bef588..5f0c659 100644 (file)
--- a/gst/vaapi/Makefile.am
+++ b/gst/vaapi/Makefile.am
@@ -123,7 +123,6 @@ libgstvaapi_source_c += $(libgstvaapi_1_0p_source_c)
 libgstvaapi_source_h += $(libgstvaapi_1_0p_source_h)
 endif
 
-if USE_GST_API_0_10
 libgstvaapi_0_10_source_c = \
        gstvaapidownload.c      \
        gstvaapiupload.c        \
@@ -133,7 +132,6 @@ libgstvaapi_0_10_source_h = \
        gstvaapidownload.h      \
        gstvaapiupload.h        \
        $(NULL)
-endif
 
 if USE_GST_API_0_10
 libgstvaapi_source_c += $(libgstvaapi_0_10_source_c)
@@ -166,6 +164,10 @@ libgstvaapi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvaapi_la_LIBTOOLFLAGS = --tag=disable-static
 
 EXTRA_DIST = \
+       $(libgstvaapi_enc_source_c)     \
+       $(libgstvaapi_enc_source_h)     \
+       $(libgstvaapi_x11_source_c)     \
+       $(libgstvaapi_x11_source_h)     \
        $(libgstvaapi_glx_source_c)     \
        $(libgstvaapi_glx_source_h)     \
        $(libgstvaapi_1_2p_source_c)    \