diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2018-01-19 23:12:45 +0100 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2018-01-20 00:24:04 +0100 |
| commit | bb3f25f29f642320ff03832619ea6f76476fd3d0 (patch) | |
| tree | ccda57d3dd0461a06e2f943c9418572a7c882bd7 | |
| parent | be93c2492749595e3f870973fffa23adb54d39b7 (diff) | |
| download | nautilus-bb3f25f29f642320ff03832619ea6f76476fd3d0.tar.gz | |
build: Build src-ng as library
So we can use in the tests. This is eventually going to be merged into
proper Nautilus.
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src-ng/meson.build | 38 |
2 files changed, 30 insertions, 10 deletions
diff --git a/meson.build b/meson.build index c7c28f2c8..c5580f913 100644 --- a/meson.build +++ b/meson.build @@ -89,6 +89,7 @@ subdir('eel') subdir('libnautilus-extension') subdir('src') +subdir ('src-ng') subdir('test') subdir('data') subdir('po') @@ -99,7 +100,6 @@ if get_option('nst_extension') subdir('nautilus-sendto-extension') endif -subdir ('src-ng') # Compile GSettings schemas when installing from source. meson.add_install_script('build-aux/meson/postinstall.py') diff --git a/src-ng/meson.build b/src-ng/meson.build index 493af051f..f6c5082f2 100644 --- a/src-ng/meson.build +++ b/src-ng/meson.build @@ -2,7 +2,7 @@ resources = gnome.compile_resources ('nautilus-ng-resources', join_paths ('res', 'org.gnome.Nautilus.gresource.xml'), source_dir: 'res') -nautilus_ng_sources = [resources, +libnautilus_ng_sources = [resources, 'nautilus-task.c', 'nautilus-task.h', 'nautilus-task-private.h', @@ -30,14 +30,34 @@ nautilus_ng_sources = [resources, 'tasks/nautilus-thumbnail-task.h', 'main.c'] -nautilus_ng_dependencies = [gio, glib, gnome_desktop, gtk] +libnautilus_ng_deps = [gio, glib, gnome_desktop, gtk] -nautilus_marshallers = gnome.genmarshal ('nautilus-marshallers', - sources: 'nautilus-marshallers.list', - prefix: 'nautilus_cclosure_marshal') +libnautilus_ng_marshallers = gnome.genmarshal ('nautilus-marshallers', + sources: 'nautilus-marshallers.list', + prefix: 'nautilus_cclosure_marshal') -nautilus_ng_sources += nautilus_marshallers +libnautilus_ng_sources += libnautilus_ng_marshallers -nautilus_ng = executable ('nautilus-ng', nautilus_ng_sources, - dependencies: nautilus_ng_dependencies, - install: true) +libnautilus_ng_include_dirs = include_directories('.') + +libnautilus_ng = static_library( + 'nautilus-ng', + libnautilus_ng_sources, + dependencies: libnautilus_ng_deps, + include_directories: libnautilus_ng_include_dirs +) + +libnautilus_ng_dep = declare_dependency( + link_with: libnautilus_ng, + include_directories: [ + libnautilus_ng_include_dirs + ], + dependencies: libnautilus_ng_deps +) + +nautilus = executable( + 'nautilus-ng', + 'main.c', + dependencies: libnautilus_ng_dep, + install: true +) |