diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2017-05-12 14:36:47 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-05-12 15:03:18 +0100 |
| commit | a75b37acb04cd21af127863ef83aed068ef15ff5 (patch) | |
| tree | 146510c99fcea77208411e11bb56e92da4b2e182 | |
| parent | 85893ea2ae9ae4113d2197b900431261a24a90bc (diff) | |
| download | clutter-gst-a75b37acb04cd21af127863ef83aed068ef15ff5.tar.gz | |
Rename the plugin to avoid the dash in the name
We need to rename both the plugin name and the plugin's shared object.
We still need to version the name of the plugin to allow for parallel
installability.
https://bugzilla.gnome.org/show_bug.cgi?id=782559
| -rw-r--r-- | clutter-gst/Makefile.am | 16 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-plugin.c | 5 |
2 files changed, 12 insertions, 9 deletions
diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am index 2f668a3..dfb9274 100644 --- a/clutter-gst/Makefile.am +++ b/clutter-gst/Makefile.am @@ -109,21 +109,21 @@ plugin_source_c = \ clutter-gst-auto-video-sink.h \ $(NULL) -libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_SOURCES = \ - $(plugin_source_c) \ +libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_SOURCES = \ + $(plugin_source_c) \ $(NULL) -plugin_LTLIBRARIES = libgstclutter-@CLUTTER_GST_MAJORMINOR@.la +plugin_LTLIBRARIES = libcluttergst@CLUTTER_GST_MAJOR_VERSION@.la -libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_LIBADD = \ +libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_LIBADD = \ $(PLUGIN_LIBS) \ $(HW_LIBS) \ $(LIBM) \ libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la -libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_LDFLAGS = \ - $(GL_LDFLAGS) \ - -module -avoid-version \ - -no-undefined \ +libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_LDFLAGS = \ + $(GL_LDFLAGS) \ + -module -avoid-version \ + -no-undefined \ $(NULL) # diff --git a/clutter-gst/clutter-gst-plugin.c b/clutter-gst/clutter-gst-plugin.c index 3f6d5a1..7c9bcd4 100644 --- a/clutter-gst/clutter-gst-plugin.c +++ b/clutter-gst/clutter-gst-plugin.c @@ -37,6 +37,9 @@ #include "clutter-gst-auto-video-sink.h" #include "clutter-gst-video-sink.h" +#include "clutter-gst-version.h" + +#define CLUTTER_GST_PLUGIN_NAME cluttergst /* entry point to initialize the plug-in * initialize the plug-in itself @@ -65,7 +68,7 @@ plugin_init (GstPlugin *plugin) GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - clutter-gst3, + G_PASTE (CLUTTER_GST_PLUGIN_NAME, CLUTTER_GST_MAJOR_VERSION), "Elements to render to ClutterGst actors", plugin_init, VERSION, |