3 files changed, 7 insertions, 39 deletions

diff --git a/src/backend/plugins/pacrunner-duktape/meson.build b/src/backend/plugins/pacrunner-duktape/meson.build
index ef4a470..f391b6d 100644
--- a/src/backend/plugins/pacrunner-duktape/meson.build
+++ b/src/backend/plugins/pacrunner-duktape/meson.build
@@ -3,35 +3,15 @@ plugin_name = 'pacrunner-duktape'
 if get_option(plugin_name)
 
 duktape_dep = dependency('duktape')
+m_dep = cc.find_library('m', required : false)
 
-plugin_src = [
-  '@0@.c'.format(plugin_name),
+px_backend_sources += [
+  'plugins/@0@/@0@.c'.format(plugin_name),
 ]
 
-plugin_data = [
-  '@0@.plugin'.format(plugin_name),
+px_backend_deps += [
+  duktape_dep,
+  m_dep
 ]
 
-plugin_lib = shared_module(
-  plugin_name,
-  plugin_src,
-  include_directories: px_backend_inc,
-  c_args: px_backend_c_args,
-  dependencies: [px_backend_dep, duktape_dep, ws2_32_dep],
-  install_dir: join_paths(px_plugins_dir, plugin_name),
-  install: true,
-  name_suffix: module_suffix,
-)
-
-# Starting with Meson 0.64 this can be replaced with fs.copyfile
-custom_target(
-  '@0@-data'.format(plugin_name),
-  input: plugin_data,
-  output: plugin_data,
-  command: ['cp', '@INPUT@', '@OUTDIR@'],
-  build_by_default: true,
-  install_dir: join_paths(px_plugins_dir, plugin_name),
-  install: true,
-)
-
 endif
\ No newline at end of file
diff --git a/src/backend/plugins/pacrunner-duktape/pacrunner-duktape.c b/src/backend/plugins/pacrunner-duktape/pacrunner-duktape.c
index 51c2592..3676e48 100644
--- a/src/backend/plugins/pacrunner-duktape/pacrunner-duktape.c
+++ b/src/backend/plugins/pacrunner-duktape/pacrunner-duktape.c
@@ -19,7 +19,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#include <libpeas/peas.h>
+#include <gio/gio.h>
 
 #include <unistd.h>
 #ifdef __WIN32__
@@ -40,7 +40,6 @@ struct _PxPacRunnerDuktape {
 };
 
 static void px_pacrunner_iface_init (PxPacRunnerInterface *iface);
-void peas_register_types (PeasObjectModule *module);
 
 G_DEFINE_FINAL_TYPE_WITH_CODE (PxPacRunnerDuktape,
                                px_pacrunner_duktape,
@@ -200,11 +199,3 @@ px_pacrunner_iface_init (PxPacRunnerInterface *iface)
   iface->set_pac = px_pacrunner_duktape_set_pac;
   iface->run = px_pacrunner_duktape_run;
 }
-
-void
-peas_register_types (PeasObjectModule *module)
-{
-  peas_object_module_register_extension_type (module,
-                                              PX_TYPE_PACRUNNER,
-                                              PX_PACRUNNER_TYPE_DUKTAPE);
-}
diff --git a/src/backend/plugins/pacrunner-duktape/pacrunner-duktape.plugin b/src/backend/plugins/pacrunner-duktape/pacrunner-duktape.plugin
deleted file mode 100644
index efb10f0..0000000
--- a/src/backend/plugins/pacrunner-duktape/pacrunner-duktape.plugin
+++ /dev/null
@@ -1,3 +0,0 @@
-[Plugin]
-Module=pacrunner-duktape
-Name=Duktape
\ No newline at end of file