validate: Move plugins to the toplevel directory

Summary:
Otherwise we end up with circular / complicated dependencies between
Validate, its libraries, and the plugins

Depends on D203

Reviewers: Mathieu_Du

Differential Revision: http://phabricator.freedesktop.org/D204
This commit is contained in:
Thibault Saunier 2015-05-25 18:52:34 +02:00
parent 83a8835a65
commit 13864f4998
10 changed files with 15 additions and 14 deletions

View File

@ -4,6 +4,7 @@ SUBDIRS = \
common \ common \
data \ data \
gst \ gst \
plugins \
launcher \ launcher \
tools \ tools \
pkgconfig \ pkgconfig \

View File

@ -303,10 +303,10 @@ gst/Makefile
gst/validate/Makefile gst/validate/Makefile
gst/preload/Makefile gst/preload/Makefile
gst/overrides/Makefile gst/overrides/Makefile
gst/plugins/Makefile plugins/Makefile
gst/plugins/fault_injection/Makefile plugins/fault_injection/Makefile
gst/plugins/gapplication/Makefile plugins/gapplication/Makefile
gst/plugins/gtk/Makefile plugins/gtk/Makefile
tests/Makefile tests/Makefile
tests/check/Makefile tests/check/Makefile
pkgconfig/Makefile pkgconfig/Makefile

View File

@ -1,4 +1,4 @@
SUBDIRS = validate overrides plugins SUBDIRS = validate overrides
if HAVE_LD_PRELOAD if HAVE_LD_PRELOAD
SUBDIRS += preload SUBDIRS += preload

View File

@ -29,7 +29,7 @@
#endif #endif
#include <gst/gst.h> #include <gst/gst.h>
#include "../../validate/gst-validate-scenario.h" #include "../../gst/validate/gst-validate-scenario.h"
#if defined(__gnu_linux__) && !defined(__ANDROID__) && !defined (ANDROID) #if defined(__gnu_linux__) && !defined(__ANDROID__) && !defined (ANDROID)

View File

@ -30,9 +30,9 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gio/gio.h> #include <gio/gio.h>
#include "../../validate/validate.h" #include "../../gst/validate/validate.h"
#include "../../validate/gst-validate-scenario.h" #include "../../gst/validate/gst-validate-scenario.h"
#include "../../validate/gst-validate-utils.h" #include "../../gst/validate/gst-validate-utils.h"
static gboolean static gboolean

View File

@ -31,11 +31,11 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include "../../validate/gst-validate-report.h" #include "../../gst/validate/gst-validate-report.h"
#include "../../validate/gst-validate-reporter.h" #include "../../gst/validate/gst-validate-reporter.h"
#include "../../validate/validate.h" #include "../../gst/validate/validate.h"
#include "../../validate/gst-validate-scenario.h" #include "../../gst/validate/gst-validate-scenario.h"
#include "../../validate/gst-validate-utils.h" #include "../../gst/validate/gst-validate-utils.h"
#define ACTION_GDKEVENTS_QUARK g_quark_from_static_string("ACTION_GDKEVENTS_QUARK") #define ACTION_GDKEVENTS_QUARK g_quark_from_static_string("ACTION_GDKEVENTS_QUARK")
static GList *awaited_actions = NULL; /* A list of GstValidateAction to be executed */ static GList *awaited_actions = NULL; /* A list of GstValidateAction to be executed */