1 files changed, 32 insertions, 9 deletions
diff --git a/libnautilus-extension/meson.build b/libnautilus-extension/meson.build
index 99dc4309e..e7c5717cf 100644
--- a/libnautilus-extension/meson.build
+++ b/libnautilus-extension/meson.build
@@ -1,13 +1,16 @@
-nautilus_extension_version = '1.4.0'
+nautilus_extension_version = '1.5.0'
+
+libnautilus_extension_deprecated_headers = [
+  'nautilus-extension-types.h',
+  'nautilus-menu-item.h'
+]
 
 libnautilus_extension_headers = [
   'nautilus-column-provider.h',
   'nautilus-column.h',
-  'nautilus-extension-types.h',
   'nautilus-file-info.h',
   'nautilus-info-provider.h',
   'nautilus-location-widget-provider.h',
-  'nautilus-menu-item.h',
   'nautilus-menu-provider.h',
   'nautilus-property-page-provider.h',
   'nautilus-property-page.h',
@@ -15,14 +18,28 @@ libnautilus_extension_headers = [
 ]
 
 install_headers(
+  'nautilus-extension.h',
+  subdir: 'nautilus'
+)
+install_headers(
   libnautilus_extension_headers,
+  libnautilus_extension_deprecated_headers,
   subdir: join_paths('nautilus', 'libnautilus-extension')
 )
 
 libnautilus_extension_sources = [
+  gnome.mkenums_simple(
+    'nautilus-extension-enum-types',
+    install_header: true,
+    install_dir: join_paths(includedir, 'nautilus', 'libnautilus-extension'),
+    sources: [
+      'nautilus-info-provider.h'
+    ]
+  ),
+  libnautilus_extension_headers,
   'nautilus-column-provider.c',
   'nautilus-column.c',
-  'nautilus-extension-types.c',
+  'nautilus-extension.h',
   'nautilus-extension-private.h',
   'nautilus-file-info.c',
   'nautilus-info-provider.c',
@@ -40,8 +57,13 @@ libnautilus_extension_deps = [
 ]
 
 libnautilus_extension = shared_library(
-  'nautilus-extension',
-  libnautilus_extension_sources,
+  'nautilus-extension', [
+    libnautilus_extension_deprecated_headers,
+    libnautilus_extension_sources,
+  ],
+  c_args: [
+    '-DNAUTILUS_COMPILATION'
+  ],
   dependencies: libnautilus_extension_deps,
   include_directories: nautilus_include_dirs,
   version: nautilus_extension_version,
@@ -50,10 +72,10 @@ libnautilus_extension = shared_library(
 
 gnome.generate_gir(
   libnautilus_extension,
-  sources: [
-    libnautilus_extension_headers,
-    libnautilus_extension_sources
+  extra_args: [
+    '-DNAUTILUS_COMPILATION'
   ],
+  sources: libnautilus_extension_sources,
   nsversion: '3.0',
   namespace: 'Nautilus',
   includes: [
@@ -61,6 +83,7 @@ gnome.generate_gir(
     'Gio-2.0',
     'GLib-2.0'
   ],
+  header: 'nautilus-extension.h',
   install: true
 )