build: Fix installation and some GTK tests

Don't specify the install directory for libpeas and libpeas-gtk, as we
need the DLLs to be in $(prefix)/bin and the .lib's/.so's to be in
$(libdir), which Meson sorts out for us automatically.

Also, just export the internal symbols for the tests when we build
libpeas-gtk, as GObject on Windows really doesn't like the idea of
mixing static .lib's with DLLs (i.e. a static libpeas-gtk mixing with a
DLL libpeas).

4 files changed, 5 insertions, 20 deletions

diff --git a/libpeas-gtk/meson.build b/libpeas-gtk/meson.build
index 8fa0856..daf98ec 100644
--- a/libpeas-gtk/meson.build
+++ b/libpeas-gtk/meson.build
@@ -42,16 +42,6 @@ install_headers(
   )
 )
 
-# Static library used for testing symbol access
-libpeas_gtk_test = static_library(
-  package_gtk_string.strip('lib'),
-  libpeas_gtk_c,
-  include_directories: rootdir,
-  dependencies: libpeas_gtk_deps,
-  c_args: libpeas_gtk_c_args,
-  link_args: libpeas_gtk_link_args,
-)
-
 libpeas_gtk_sha = library(
   package_gtk_string.strip('lib'),
   libpeas_gtk_c,
@@ -62,7 +52,6 @@ libpeas_gtk_sha = library(
   c_args: libpeas_gtk_c_args,
   link_args: libpeas_gtk_link_args,
   install: true,
-  install_dir: libdir,
 )
 
 libpeas_gtk_dep_sources = []
@@ -105,13 +94,6 @@ libpeas_gtk_dep = declare_dependency(
   sources: libpeas_gtk_dep_sources,
 )
 
-libpeas_gtk_test_dep = declare_dependency(
-  link_with: libpeas_gtk_test,
-  dependencies: libpeas_gtk_deps,
-  include_directories: rootdir,
-  sources: libpeas_gtk_dep_sources,
-)
-
 libpeas_gtk_pc_reqs = [
   glib_dep,
   gtk_dep,
diff --git a/libpeas-gtk/peas-gtk-plugin-manager-store.h b/libpeas-gtk/peas-gtk-plugin-manager-store.h
index 729ff07..6c3a13b 100644
--- a/libpeas-gtk/peas-gtk-plugin-manager-store.h
+++ b/libpeas-gtk/peas-gtk-plugin-manager-store.h
@@ -65,6 +65,7 @@ struct _PeasGtkPluginManagerStoreClass {
 };
 
 GType                       peas_gtk_plugin_manager_store_get_type              (void) G_GNUC_CONST;
+PEAS_AVAILABLE_IN_ALL
 PeasGtkPluginManagerStore  *peas_gtk_plugin_manager_store_new                   (PeasEngine                *engine);
 
 void                        peas_gtk_plugin_manager_store_reload                (PeasGtkPluginManagerStore *store);
@@ -72,6 +73,7 @@ void                        peas_gtk_plugin_manager_store_reload
 void                        peas_gtk_plugin_manager_store_set_enabled           (PeasGtkPluginManagerStore *store,
                                                                                  GtkTreeIter               *iter,
                                                                                  gboolean                   enabled);
+PEAS_AVAILABLE_IN_ALL
 gboolean                    peas_gtk_plugin_manager_store_get_enabled           (PeasGtkPluginManagerStore *store,
                                                                                  GtkTreeIter               *iter);
 void                        peas_gtk_plugin_manager_store_set_all_enabled       (PeasGtkPluginManagerStore *store,
@@ -82,9 +84,11 @@ void                        peas_gtk_plugin_manager_store_toggle_enabled
 gboolean                    peas_gtk_plugin_manager_store_can_enable            (PeasGtkPluginManagerStore *store,
                                                                                  GtkTreeIter               *iter);
 
+PEAS_AVAILABLE_IN_ALL
 PeasPluginInfo             *peas_gtk_plugin_manager_store_get_plugin            (PeasGtkPluginManagerStore *store,
                                                                                  GtkTreeIter               *iter);
 
+PEAS_AVAILABLE_IN_ALL
 gboolean                    peas_gtk_plugin_manager_store_get_iter_from_plugin  (PeasGtkPluginManagerStore *store,
                                                                                  GtkTreeIter               *iter,
                                                                                  const PeasPluginInfo      *info);
diff --git a/libpeas/meson.build b/libpeas/meson.build
index 2e1f2c2..d32c6b9 100644
--- a/libpeas/meson.build
+++ b/libpeas/meson.build
@@ -111,7 +111,6 @@ libpeas_sha = library(
   objc_args: libpeas_c_args,
   link_args: libpeas_link_args,
   install: true,
-  install_dir: libdir,
 )
 
 libpeas_dep_sources = [
diff --git a/tests/libpeas-gtk/testing/meson.build b/tests/libpeas-gtk/testing/meson.build
index 102013a..646f42d 100644
--- a/tests/libpeas-gtk/testing/meson.build
+++ b/tests/libpeas-gtk/testing/meson.build
@@ -13,7 +13,7 @@ libpeas_gtk_testing_deps = [
   glib_dep,
   introspection_dep,
   libpeas_dep,
-  libpeas_gtk_test_dep,
+  libpeas_gtk_dep,
   libtesting_util_dep,
 ]