plugin: Rename the .so file from plugin.so to libplugin.so
This is the filename convention you get when you define a shared module in meson, and since there is no particular reason to not include the "lib" prefix, lets make it easier to port it over. While at it, de-duplicate the retrieval of the plugin name.
This commit is contained in:
parent
85fbf66179
commit
0afaf5262b
@ -66,6 +66,8 @@ mutter_test_unit_tests_SOURCES = \
|
|||||||
mutter_test_unit_tests_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API_VERSION).la
|
mutter_test_unit_tests_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API_VERSION).la
|
||||||
|
|
||||||
mutter_test_headless_start_test_SOURCES = \
|
mutter_test_headless_start_test_SOURCES = \
|
||||||
|
tests/test-utils.c \
|
||||||
|
tests/test-utils.h \
|
||||||
tests/headless-start-test.c \
|
tests/headless-start-test.c \
|
||||||
tests/meta-backend-test.c \
|
tests/meta-backend-test.c \
|
||||||
tests/meta-backend-test.h \
|
tests/meta-backend-test.h \
|
||||||
|
@ -19,12 +19,12 @@ AM_CPPFLAGS = \
|
|||||||
-DSN_API_NOT_YET_FROZEN=1 \
|
-DSN_API_NOT_YET_FROZEN=1 \
|
||||||
-DMUTTER_PLUGIN_DIR=\"$(MUTTER_PLUGIN_DIR)\"
|
-DMUTTER_PLUGIN_DIR=\"$(MUTTER_PLUGIN_DIR)\"
|
||||||
|
|
||||||
default_la_CFLAGS = -fPIC
|
libdefault_la_CFLAGS = -fPIC
|
||||||
default_la_SOURCES = default.c
|
libdefault_la_SOURCES = default.c
|
||||||
default_la_LDFLAGS = -module -avoid-version -no-undefined
|
libdefault_la_LDFLAGS = -module -avoid-version -no-undefined
|
||||||
default_la_LIBADD = $(CLUTTER_LIBS)
|
libdefault_la_LIBADD = $(CLUTTER_LIBS)
|
||||||
|
|
||||||
pkglib_LTLIBRARIES = default.la
|
pkglib_LTLIBRARIES = libdefault.la
|
||||||
|
|
||||||
# post-install hook to remove the .la and .a files we are not interested in
|
# post-install hook to remove the .la and .a files we are not interested in
|
||||||
# (There is no way to stop libtool generating static libs locally, and we
|
# (There is no way to stop libtool generating static libs locally, and we
|
||||||
@ -37,4 +37,4 @@ install-exec-hook:
|
|||||||
# since it counts on libtool to remove the .la files, so just kill the
|
# since it counts on libtool to remove the .la files, so just kill the
|
||||||
# .so file manually.
|
# .so file manually.
|
||||||
uninstall-local:
|
uninstall-local:
|
||||||
-rm -f $(DESTDIR)$(pkglibdir)/default.so
|
-rm -f $(DESTDIR)$(pkglibdir)/libdefault.so
|
||||||
|
@ -43,7 +43,7 @@ print_version (const gchar *option_name,
|
|||||||
exit (0);
|
exit (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *plugin = "default";
|
static const char *plugin = "libdefault";
|
||||||
|
|
||||||
GOptionEntry mutter_options[] = {
|
GOptionEntry mutter_options[] = {
|
||||||
{
|
{
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
#include "meta/main.h"
|
#include "meta/main.h"
|
||||||
#include "tests/meta-backend-test.h"
|
#include "tests/meta-backend-test.h"
|
||||||
#include "tests/meta-monitor-manager-test.h"
|
#include "tests/meta-monitor-manager-test.h"
|
||||||
|
#include "tests/test-utils.h"
|
||||||
#include "wayland/meta-wayland.h"
|
#include "wayland/meta-wayland.h"
|
||||||
|
|
||||||
#define ALL_TRANSFORMS ((1 << (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)) - 1)
|
#define ALL_TRANSFORMS ((1 << (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)) - 1)
|
||||||
@ -186,7 +187,7 @@ main (int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
init_tests (argc, argv);
|
init_tests (argc, argv);
|
||||||
|
|
||||||
meta_plugin_manager_load ("default");
|
meta_plugin_manager_load (test_get_plugin_name ());
|
||||||
|
|
||||||
meta_override_compositor_configuration (META_COMPOSITOR_TYPE_WAYLAND,
|
meta_override_compositor_configuration (META_COMPOSITOR_TYPE_WAYLAND,
|
||||||
META_TYPE_BACKEND_TEST);
|
META_TYPE_BACKEND_TEST);
|
||||||
|
@ -840,7 +840,7 @@ main (int argc, char **argv)
|
|||||||
}
|
}
|
||||||
g_option_context_free (ctx);
|
g_option_context_free (ctx);
|
||||||
|
|
||||||
meta_plugin_manager_load ("default");
|
meta_plugin_manager_load (test_get_plugin_name ());
|
||||||
meta_wayland_override_display_name ("mutter-test-display");
|
meta_wayland_override_display_name ("mutter-test-display");
|
||||||
|
|
||||||
meta_init ();
|
meta_init ();
|
||||||
|
@ -443,3 +443,9 @@ test_client_destroy (TestClient *client)
|
|||||||
g_free (client->id);
|
g_free (client->id);
|
||||||
g_free (client);
|
g_free (client);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const char *
|
||||||
|
test_get_plugin_name (void)
|
||||||
|
{
|
||||||
|
return "libdefault";
|
||||||
|
}
|
||||||
|
@ -79,4 +79,6 @@ TestClient * test_client_new (const char *id,
|
|||||||
|
|
||||||
void test_client_destroy (TestClient *client);
|
void test_client_destroy (TestClient *client);
|
||||||
|
|
||||||
|
const char * test_get_plugin_name (void);
|
||||||
|
|
||||||
#endif /* TEST_UTILS_H */
|
#endif /* TEST_UTILS_H */
|
||||||
|
@ -262,7 +262,7 @@ main (int argc, char *argv[])
|
|||||||
test_init (argc, argv);
|
test_init (argc, argv);
|
||||||
init_tests (argc, argv);
|
init_tests (argc, argv);
|
||||||
|
|
||||||
meta_plugin_manager_load ("default");
|
meta_plugin_manager_load (test_get_plugin_name ());
|
||||||
|
|
||||||
meta_override_compositor_configuration (META_COMPOSITOR_TYPE_WAYLAND,
|
meta_override_compositor_configuration (META_COMPOSITOR_TYPE_WAYLAND,
|
||||||
META_TYPE_BACKEND_TEST);
|
META_TYPE_BACKEND_TEST);
|
||||||
|
Loading…
Reference in New Issue
Block a user