mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-20 02:50:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate: Move overrides and preload libraries to dedicated folders

Browse source 
This way it is cleaner and it is simpler to handle the various compilation dependencies.
This commit is contained in:
Thibault Saunier 2014-05-21 11:50:09 +02:00
parent 1043aa3f55
commit 1a2f4a3cd3
7 changed files with 37 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
validate/configure.ac
View file

@ -268,6 +268,8 @@ common/m4/Makefile
data/Makefile
gst/Makefile
gst/validate/Makefile
gst/preload/Makefile
gst/overrides/Makefile
pkgconfig/Makefile
pkgconfig/gst-validate-uninstalled.pc
pkgconfig/gst-validate.pc

6
validate/gst/Makefile.am
View file

@ -1 +1,5 @@
SUBDIRS = validate
SUBDIRS = validate overrides
if HAVE_LD_PRELOAD
SUBDIRS += preload
endif

14
validate/gst/overrides/Makefile.am Normal file
View file

@ -0,0 +1,14 @@
lib_LTLIBRARIES = libgstvalidate-default-overrides-@GST_API_VERSION@.la
libgstvalidate_default_overrides_@GST_API_VERSION@_la_SOURCES = \
gst-validate-default-overrides.c
libgstvalidate_default_overrides_@GST_API_VERSION@_la_CFLAGS = $(GST_ALL_CFLAGS) $(GIO_CFLAGS)
libgstvalidate_default_overrides_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) \
$(GST_LT_LDFLAGS) $(GIO_LDFLAGS) $(top_builddir)/gst/validate/libgstvalidate-1.0.la
libgstvalidate_default_overrides_@GST_API_VERSION@_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
$(GST_ALL_LIBS) $(GIO_LIBS)
libgstvalidate_default_overrides_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/validate
libgstvalidate_default_overrides_@GST_API_VERSION@include_HEADERS =
CLEANFILES =

6
validate/gst/validate/gst-validate-default-overrides.c → validate/gst/overrides/gst-validate-default-overrides.c
View file

@ -24,9 +24,9 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gst-validate-override.h"
#include "gst-validate-override-registry.h"
#include "gst-validate-report.h"
#include <gst/validate/gst-validate-override.h>
#include <gst/validate/gst-validate-override-registry.h>
#include <gst/validate/gst-validate-report.h>
/* public symbol */
int gst_validate_create_overrides (void);

13
validate/gst/preload/Makefile.am Normal file
View file

@ -0,0 +1,13 @@
libgstvalidate_preload_@GST_API_VERSION@_la_SOURCES = \
gst-validate-monitor-preload.c
libgstvalidate_preload_@GST_API_VERSION@_la_CFLAGS = $(GST_ALL_CFLAGS)
libgstvalidate_preload_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) \
$(GST_LT_LDFLAGS) $(top_builddir)/gst/validate/libgstvalidate-1.0.la
libgstvalidate_preload_@GST_API_VERSION@_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
$(GST_ALL_LIBS)
libgstvalidate_preload_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/validate
libgstvalidate_preload_@GST_API_VERSION@include_HEADERS =
CLEANFILES =

0
validate/gst/validate/gst-validate-monitor-preload.c → validate/gst/preload/gst-validate-monitor-preload.c
View file

36
validate/gst/validate/Makefile.am
View file

@ -41,12 +41,6 @@ libgstvalidate_@GST_API_VERSION@include_HEADERS = \
lib_LTLIBRARIES = libgstvalidate-@GST_API_VERSION@.la
if HAVE_LD_PRELOAD
lib_LTLIBRARIES += libgstvalidate-default-overrides-@GST_API_VERSION@.la \
libgstvalidate-preload-@GST_API_VERSION@.la
endif
libgstvalidate_@GST_API_VERSION@_la_CFLAGS = $(GST_ALL_CFLAGS) $(GIO_CFLAGS) $(GST_PBUTILS_CFLAGS)
libgstvalidate_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) \
$(GST_LT_LDFLAGS) $(GIO_LDFLAGS) $(GST_PBUTILS_LDFAGS)
@ -56,34 +50,4 @@ libgstvalidate_@GST_API_VERSION@_la_LIBADD = \
libgstvalidate_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/validate
if HAVE_LD_PRELOAD
libgstvalidate_default_overrides_@GST_API_VERSION@_la_SOURCES = \
gst-validate-default-overrides.c
libgstvalidate_default_overrides_@GST_API_VERSION@_la_CFLAGS = $(GST_ALL_CFLAGS) $(GIO_CFLAGS)
libgstvalidate_default_overrides_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) \
$(GST_LT_LDFLAGS) $(GIO_LDFLAGS)
libgstvalidate_default_overrides_@GST_API_VERSION@_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
$(GST_ALL_LIBS) $(GIO_LIBS)
libgstvalidate_default_overrides_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/validate
libgstvalidate_default_overrides_@GST_API_VERSION@include_HEADERS =
libgstvalidate_preload_@GST_API_VERSION@_la_SOURCES = \
gst-validate-monitor-preload.c
libgstvalidate_preload_@GST_API_VERSION@_la_CFLAGS = $(GST_ALL_CFLAGS)
libgstvalidate_preload_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) \
$(GST_LT_LDFLAGS)
libgstvalidate_preload_@GST_API_VERSION@_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
$(GST_ALL_LIBS)
libgstvalidate_preload_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/validate
libgstvalidate_preload_@GST_API_VERSION@include_HEADERS =
endif
#AM_CFLAGS = $(GST_ALL_CFLAGS) $(GST_PBUTILS_CFLAGS)
#LDADD = $(top_builddir)/gst/validate/libgstvalidate-@GST_API_VERSION@.la $(GST_PBUTILS_LIBS) $(GST_LIBS)
CLEANFILES =