1
0
mirror of https://github.com/GNOME/gedit synced 2024-06-30 23:15:01 +00:00

Meson: plugins: filebrowser: refactorings

The refactoring is not finished for this plugin. But commit anyway, to
not end up with an unreadable diff.
This commit is contained in:
Sébastien Wilmet 2024-06-26 23:11:19 +02:00
parent 06f9850352
commit ce868b41a3
3 changed files with 12 additions and 18 deletions

View File

@ -1,4 +1,4 @@
libfilebrowser_public_h = files(
plugin_filebrowser_headers = files(
'gedit-file-bookmarks-store.h',
'gedit-file-browser-error.h',
'gedit-file-browser-store.h',
@ -9,7 +9,7 @@ libfilebrowser_public_h = files(
'gedit-file-browser-messages.h',
)
libfilebrowser_sources = files(
plugin_filebrowser_c_files = files(
'gedit-file-bookmarks-store.c',
'gedit-file-browser-messages.c',
'gedit-file-browser-plugin.c',
@ -19,22 +19,18 @@ libfilebrowser_sources = files(
'gedit-file-browser-widget.c',
)
libfilebrowser_deps = [
libgedit_dep,
]
subdir('messages')
libfilebrowser_register_enums = gnome.mkenums(
'gedit-file-browser-enum-register',
sources: libfilebrowser_public_h,
sources: plugin_filebrowser_headers,
c_template: 'gedit-file-browser-enum-register.c.template',
)
libfilebrowser_type_enums = gnome.mkenums(
'gedit-file-browser-enum-types',
depends : [libfilebrowser_register_enums],
sources: libfilebrowser_public_h,
sources: plugin_filebrowser_headers,
h_template: 'gedit-file-browser-enum-types.h.template',
c_template: 'gedit-file-browser-enum-types-stage1.c.template',
)
@ -53,7 +49,7 @@ libfilebrowser_enums_c = custom_target('libfilebrowser_enums_c',
capture: true,
)
libfilebrowser_sources += [
plugin_filebrowser_c_files += [
libfilebrowser_enums_c,
libfilebrowser_type_enums.get(1),
]
@ -62,9 +58,9 @@ subdir('resources')
libfilebrowser_sha = shared_module(
'filebrowser',
sources: libfilebrowser_sources,
sources: plugin_filebrowser_c_files,
include_directories: root_include_dir,
dependencies: libfilebrowser_deps,
dependencies: libgedit_dep,
install: true,
install_dir: join_paths(
pkglibdir,
@ -76,7 +72,7 @@ libfilebrowser_sha = shared_module(
# FIXME: https://github.com/mesonbuild/meson/issues/1687
custom_target(
'org.gnome.gedit.plugins.filebrowser.enums.xml',
input : libfilebrowser_sources + libfilebrowser_public_h,
input : plugin_filebrowser_c_files + plugin_filebrowser_headers,
output: 'org.gnome.gedit.plugins.filebrowser.enums.xml',
capture: true,
command: [

View File

@ -1,4 +1,4 @@
libfilebrowser_public_h += files(
plugin_filebrowser_headers += files(
'gedit-file-browser-message-activation.h',
'gedit-file-browser-message-add-filter.h',
'gedit-file-browser-message-extend-context-menu.h',
@ -11,7 +11,7 @@ libfilebrowser_public_h += files(
'gedit-file-browser-message-set-root.h',
)
libfilebrowser_sources += files(
plugin_filebrowser_c_files += files(
'gedit-file-browser-message-activation.c',
'gedit-file-browser-message-add-filter.c',
'gedit-file-browser-message-extend-context-menu.c',

View File

@ -1,8 +1,6 @@
libfilebrowser_res = gnome.compile_resources(
plugin_filebrowser_gresources = gnome.compile_resources(
'gedit-file-browser-resources',
'gedit-file-browser.gresource.xml',
)
libfilebrowser_sources += [
libfilebrowser_res.get(0),
]
plugin_filebrowser_c_files += plugin_filebrowser_gresources[0]