mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-28 11:10:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix make dist to include all source files, in any case.

Browse source 
Fix make dist to allow build for either GStreamer 0.10 or 1.0. i.e. make
sure to include all source files in either case while generating source
tarballs.
This commit is contained in:
Gwenole Beauchesne 2013-04-10 15:31:41 +02:00
parent 25538ca279
commit aedef381b2
2 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst-libs/gst/vaapi/Makefile.am
View file

@ -119,9 +119,11 @@ libgstvaapi_source_priv_h = \
sysdeps.h \
$(NULL)
libgstvaapi_jpegdec_source_c = gstvaapidecoder_jpeg.c
libgstvaapi_jpegdec_source_h = gstvaapidecoder_jpeg.h
if USE_JPEG_DECODER
libgstvaapi_source_c += gstvaapidecoder_jpeg.c
libgstvaapi_source_h += gstvaapidecoder_jpeg.h
libgstvaapi_source_c += $(libgstvaapi_jpegdec_source_c)
libgstvaapi_source_h += $(libgstvaapi_jpegdec_source_h)
endif
libgstvaapi_drm_source_c = \
@ -395,6 +397,11 @@ $(PKG_VERSION_FILE): $(NEW_VERSION_FILE)
BUILT_SOURCES = gstvaapiversion.h
EXTRA_DIST = gstvaapiversion.h.in $(PKG_VERSION_FILE)
EXTRA_DIST += \
$(libgstvaapi_jpegdec_source_c) \
$(libgstvaapi_jpegdec_source_h) \
$(NULL)
CLEANFILES = \
$(OLD_VERSION_FILE) \
$(NEW_VERSION_FILE) \

34
gst/vaapi/Makefile.am
View file

@ -48,37 +48,48 @@ libgstvaapi_source_h = \
gstvaapivideometa.h \
$(NULL)
libgstvaapi_glx_source_c = gstvaapivideoconverter_glx.c
libgstvaapi_glx_source_h = gstvaapivideoconverter_glx.h
if USE_GLX
libgstvaapi_source_c += gstvaapivideoconverter_glx.c
libgstvaapi_source_h += gstvaapivideoconverter_glx.h
libgstvaapi_source_c += $(libgstvaapi_glx_source_c)
libgstvaapi_source_h += $(libgstvaapi_glx_source_h)
endif
if USE_GST_API_1_0p
libgstvaapi_source_c += \
libgstvaapi_1_0p_source_c = \
gstvaapivideobufferpool.c \
gstvaapivideomemory.c \
$(NULL)
libgstvaapi_source_h += \
libgstvaapi_1_0p_source_h = \
gstvaapivideobufferpool.h \
gstvaapivideomemory.h \
$(NULL)
if USE_GST_API_1_0p
libgstvaapi_source_c += $(libgstvaapi_1_0p_source_c)
libgstvaapi_source_h += $(libgstvaapi_1_0p_source_h)
endif
if USE_GST_API_0_10
libgstvaapi_source_c += \
libgstvaapi_0_10_source_c = \
gstvaapidownload.c \
gstvaapipostproc.c \
gstvaapiupload.c \
$(NULL)
libgstvaapi_source_h += \
libgstvaapi_0_10_source_h = \
gstvaapidownload.h \
gstvaapipostproc.h \
gstvaapiupload.h \
$(NULL)
endif
if USE_GST_API_0_10
libgstvaapi_source_c += $(libgstvaapi_0_10_source_c)
libgstvaapi_source_h += $(libgstvaapi_0_10_source_h)
endif
libgstvaapi_la_SOURCES = $(libgstvaapi_source_c)
noinst_HEADERS = $(libgstvaapi_source_h)
@ -104,5 +115,14 @@ libgstvaapi_la_LIBADD = \
libgstvaapi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstvaapi_la_LIBTOOLFLAGS = --tag=disable-static
EXTRA_DIST = \
$(libgstvaapi_glx_source_c) \
$(libgstvaapi_glx_source_h) \
$(libgstvaapi_1_0p_source_c) \
$(libgstvaapi_1_0p_source_h) \
$(libgstvaapi_0_10_source_c) \
$(libgstvaapi_0_10_source_h) \
$(NULL)
# Extra clean files so that maintainer-clean removes *everything*
MAINTAINERCLEANFILES = Makefile.in