[gthumb] meson: added remaining extensions



commit 790625db1b64b3e92a024849ab49bd8b39104a1d
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Oct 22 12:14:34 2017 +0200

    meson: added remaining extensions

 data/gschemas/meson.build                          |    2 +
 extensions/23hq/23hq.extension.in.in               |   11 ++--
 extensions/23hq/meson.build                        |   41 +++++++++++++++
 extensions/burn_disc/burn_disc.extension.in.in     |   10 ++--
 extensions/burn_disc/data/meson.build              |    1 +
 extensions/burn_disc/data/ui/meson.build           |    1 +
 extensions/burn_disc/meson.build                   |   38 ++++++++++++++
 extensions/change_date/change_date.extension.in.in |   10 ++--
 extensions/change_date/data/meson.build            |    1 +
 extensions/change_date/data/ui/meson.build         |    1 +
 extensions/change_date/meson.build                 |   38 ++++++++++++++
 .../contact_sheet/contact_sheet.extension.in.in    |   10 ++--
 .../default.cst                                    |    0
 .../data/contactsheetthemes/meson.build            |    6 ++
 .../minimalist.cst                                 |    0
 .../rainbow.cst                                    |    0
 extensions/contact_sheet/data/meson.build          |    2 +
 extensions/contact_sheet/data/ui/meson.build       |    6 ++
 extensions/contact_sheet/gth-contact-sheet-theme.c |    2 +-
 extensions/contact_sheet/meson.build               |   54 ++++++++++++++++++++
 .../convert_format/convert_format.extension.in.in  |   10 ++--
 extensions/convert_format/data/meson.build         |    1 +
 extensions/convert_format/data/ui/meson.build      |    1 +
 extensions/convert_format/meson.build              |   37 +++++++++++++
 extensions/facebook/data/meson.build               |    1 +
 extensions/facebook/data/ui/meson.build            |    6 ++
 extensions/facebook/facebook.extension.in.in       |   11 ++--
 extensions/facebook/meson.build                    |   54 ++++++++++++++++++++
 extensions/flicker/flicker.extension.in.in         |   11 ++--
 extensions/flicker/meson.build                     |   42 +++++++++++++++
 extensions/flicker_utils/data/meson.build          |    1 +
 extensions/flicker_utils/data/ui/meson.build       |    5 ++
 .../flicker_utils/flicker_utils.extension.in.in    |    2 +-
 extensions/flicker_utils/meson.build               |   50 ++++++++++++++++++
 extensions/importer/meson.build                    |    2 +
 extensions/list_tools/meson.build                  |    2 +-
 extensions/meson.build                             |   30 ++++++------
 extensions/oauth/data/meson.build                  |    1 +
 extensions/oauth/data/ui/meson.build               |    6 ++
 extensions/oauth/meson.build                       |   47 +++++++++++++++++
 extensions/oauth/oauth.extension.in.in             |    2 +-
 extensions/photo_importer/meson.build              |    2 +-
 extensions/photobucket/data/meson.build            |    1 +
 extensions/photobucket/data/ui/meson.build         |    5 ++
 extensions/photobucket/meson.build                 |   51 ++++++++++++++++++
 extensions/picasaweb/data/meson.build              |    1 +
 extensions/picasaweb/data/ui/meson.build           |    6 ++
 extensions/picasaweb/meson.build                   |   52 +++++++++++++++++++
 extensions/picasaweb/picasaweb.extension.in.in     |   11 ++--
 extensions/red_eye_removal/data/meson.build        |    1 +
 extensions/red_eye_removal/data/ui/meson.build     |    4 ++
 extensions/red_eye_removal/meson.build             |   35 +++++++++++++
 .../red_eye_removal.extension.in.in                |   10 ++--
 extensions/rename_series/data/meson.build          |    1 +
 extensions/rename_series/data/ui/meson.build       |    1 +
 extensions/rename_series/meson.build               |   39 ++++++++++++++
 .../rename_series/rename_series.extension.in.in    |   10 ++--
 extensions/resize_images/data/meson.build          |    1 +
 extensions/resize_images/data/ui/meson.build       |    1 +
 extensions/resize_images/meson.build               |   38 ++++++++++++++
 .../resize_images/resize_images.extension.in.in    |   10 ++--
 extensions/webalbums/data/albumthemes/meson.build  |   10 ++++
 extensions/webalbums/data/albumthemes/text.h       |    2 +-
 .../webalbums/data/albumthemes/update-text-h.rb    |    2 +-
 extensions/webalbums/data/meson.build              |    2 +
 extensions/webalbums/data/ui/meson.build           |    1 +
 extensions/webalbums/meson.build                   |   53 +++++++++++++++++++
 extensions/webalbums/webalbums.extension.in.in     |   10 ++--
 meson.build                                        |    8 +++-
 69 files changed, 837 insertions(+), 87 deletions(-)
---
diff --git a/data/gschemas/meson.build b/data/gschemas/meson.build
index 7c26d88..bb7caaf 100644
--- a/data/gschemas/meson.build
+++ b/data/gschemas/meson.build
@@ -23,3 +23,5 @@ gschema_files = files(
   'org.gnome.gthumb.webalbums.gschema.xml'
 )
 install_data(gschema_files, install_dir : join_paths(datadir, 'glib-2.0', 'schemas'))
+
+gnome.compile_schemas()
diff --git a/extensions/23hq/23hq.extension.in.in b/extensions/23hq/23hq.extension.in.in
index 9d6d033..b012fcd 100644
--- a/extensions/23hq/23hq.extension.in.in
+++ b/extensions/23hq/23hq.extension.in.in
@@ -1,13 +1,12 @@
 [Extension]
-_Name=23
-_Description=Upload images to 23hq.com
-_Authors=gthumb development team
+Name=23
+Comment=Upload images to 23hq.com
+Authors=gthumb development team
 Copyright=Copyright © 2011-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
-Icon=site-twentythree
+Version=@GTHUMB_VERSION@
 Category=Exporter
 
 [Loader]
 Type=module
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 Requires=importer;export_tools;flicker_utils
diff --git a/extensions/23hq/meson.build b/extensions/23hq/meson.build
new file mode 100644
index 0000000..384c69e
--- /dev/null
+++ b/extensions/23hq/meson.build
@@ -0,0 +1,41 @@
+
+source_files = files(
+  'actions.c',
+  'callbacks.c',
+  'main.c'
+)
+
+shared_module('23hq', 
+  sources : source_files,
+  dependencies : [
+    extension_common_deps,
+    libsoup_dep,
+    use_libsecret ? libsecret_dep : [],    
+  ],
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with : [
+    flicker_utils_mod,
+    export_tools_mod,
+    importer_mod
+  ],
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : '23hq.extension.in.in',
+  output : '23hq.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : '23hq.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
diff --git a/extensions/burn_disc/burn_disc.extension.in.in b/extensions/burn_disc/burn_disc.extension.in.in
index 34d08c3..9acf8b6 100644
--- a/extensions/burn_disc/burn_disc.extension.in.in
+++ b/extensions/burn_disc/burn_disc.extension.in.in
@@ -1,13 +1,13 @@
 [Extension]
-_Name=Burn CD/DVD
-_Description=Save files to an optical disc.
-_Authors=gthumb development team
+Name=Burn CD/DVD
+Comment=Save files to an optical disc.
+Authors=gthumb development team
 Copyright=Copyright © 2010-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
+Version=@GTHUMB_VERSION@
 Icon=brasero
 Category=Exporter
 
 [Loader]
 Type=module
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 Requires=export_tools
diff --git a/extensions/burn_disc/data/meson.build b/extensions/burn_disc/data/meson.build
new file mode 100644
index 0000000..36e5b29
--- /dev/null
+++ b/extensions/burn_disc/data/meson.build
@@ -0,0 +1 @@
+subdir('ui')
diff --git a/extensions/burn_disc/data/ui/meson.build b/extensions/burn_disc/data/ui/meson.build
new file mode 100644
index 0000000..2588b84
--- /dev/null
+++ b/extensions/burn_disc/data/ui/meson.build
@@ -0,0 +1 @@
+install_data('burn-disc-options.ui', 'burn-source-selector.ui', install_dir : ui_install_dir)
diff --git a/extensions/burn_disc/meson.build b/extensions/burn_disc/meson.build
new file mode 100644
index 0000000..31374ef
--- /dev/null
+++ b/extensions/burn_disc/meson.build
@@ -0,0 +1,38 @@
+
+source_files = files(
+  'actions.c',
+  'callbacks.c',
+  'gth-burn-task.c',
+  'main.c'
+)
+
+shared_module('burn_disc', 
+  sources : source_files,
+  dependencies : [ extension_common_deps, libbrasero_dep ],
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with : export_tools_mod,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'burn_disc.extension.in.in',
+  output : 'burn_disc.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'burn_disc.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')
diff --git a/extensions/change_date/change_date.extension.in.in 
b/extensions/change_date/change_date.extension.in.in
index bac3544..c35c770 100644
--- a/extensions/change_date/change_date.extension.in.in
+++ b/extensions/change_date/change_date.extension.in.in
@@ -1,12 +1,12 @@
 [Extension]
-_Name=Change date
-_Description=Change the files date
-_Authors=gthumb development team
+Name=Change date
+Comment=Change the files date
+Authors=gthumb development team
 Copyright=Copyright © 2010-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
+Version=@GTHUMB_VERSION@
 Category=List-Tool
 
 [Loader]
 Type=module
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 Requires=list_tools
diff --git a/extensions/change_date/data/meson.build b/extensions/change_date/data/meson.build
new file mode 100644
index 0000000..36e5b29
--- /dev/null
+++ b/extensions/change_date/data/meson.build
@@ -0,0 +1 @@
+subdir('ui')
diff --git a/extensions/change_date/data/ui/meson.build b/extensions/change_date/data/ui/meson.build
new file mode 100644
index 0000000..bc27382
--- /dev/null
+++ b/extensions/change_date/data/ui/meson.build
@@ -0,0 +1 @@
+install_data('change-date.ui', install_dir : ui_install_dir)
diff --git a/extensions/change_date/meson.build b/extensions/change_date/meson.build
new file mode 100644
index 0000000..59c9620
--- /dev/null
+++ b/extensions/change_date/meson.build
@@ -0,0 +1,38 @@
+
+source_files = files(
+  'actions.c',
+  'callbacks.c',
+  'dlg-change-date.c',
+  'gth-change-date-task.c',
+  'main.c'
+)
+
+shared_module('change_date', 
+  sources : source_files,
+  dependencies : extension_common_deps,
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'change_date.extension.in.in',
+  output : 'change_date.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'change_date.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')
diff --git a/extensions/contact_sheet/contact_sheet.extension.in.in 
b/extensions/contact_sheet/contact_sheet.extension.in.in
index 3671002..92a3494 100644
--- a/extensions/contact_sheet/contact_sheet.extension.in.in
+++ b/extensions/contact_sheet/contact_sheet.extension.in.in
@@ -1,12 +1,12 @@
 [Extension]
-_Name=Contact Sheet
-_Description=Create an index image displaying the thumbnails of the selected files.
-_Authors=gthumb development team
+Name=Contact Sheet
+Comment=Create an index image displaying the thumbnails of the selected files.
+Authors=gthumb development team
 Copyright=Copyright © 2010-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
+Version=@GTHUMB_VERSION@
 Category=Exporter
 
 [Loader]
 Type=module
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 Requires=export_tools
diff --git a/extensions/contact_sheet/data/contact_sheet_themes/default.cst 
b/extensions/contact_sheet/data/contactsheetthemes/default.cst
similarity index 100%
rename from extensions/contact_sheet/data/contact_sheet_themes/default.cst
rename to extensions/contact_sheet/data/contactsheetthemes/default.cst
diff --git a/extensions/contact_sheet/data/contactsheetthemes/meson.build 
b/extensions/contact_sheet/data/contactsheetthemes/meson.build
new file mode 100644
index 0000000..35b6ceb
--- /dev/null
+++ b/extensions/contact_sheet/data/contactsheetthemes/meson.build
@@ -0,0 +1,6 @@
+theme_files = files(
+  'default.cst',
+  'minimalist.cst',
+  'rainbow.cst'
+)
+install_data(theme_files, install_dir : join_paths(pkgdatadir, 'contactsheetthemes'))
diff --git a/extensions/contact_sheet/data/contact_sheet_themes/minimalist.cst 
b/extensions/contact_sheet/data/contactsheetthemes/minimalist.cst
similarity index 100%
rename from extensions/contact_sheet/data/contact_sheet_themes/minimalist.cst
rename to extensions/contact_sheet/data/contactsheetthemes/minimalist.cst
diff --git a/extensions/contact_sheet/data/contact_sheet_themes/rainbow.cst 
b/extensions/contact_sheet/data/contactsheetthemes/rainbow.cst
similarity index 100%
rename from extensions/contact_sheet/data/contact_sheet_themes/rainbow.cst
rename to extensions/contact_sheet/data/contactsheetthemes/rainbow.cst
diff --git a/extensions/contact_sheet/data/meson.build b/extensions/contact_sheet/data/meson.build
new file mode 100644
index 0000000..322b2b2
--- /dev/null
+++ b/extensions/contact_sheet/data/meson.build
@@ -0,0 +1,2 @@
+subdir('contactsheetthemes')
+subdir('ui')
diff --git a/extensions/contact_sheet/data/ui/meson.build b/extensions/contact_sheet/data/ui/meson.build
new file mode 100644
index 0000000..df5a860
--- /dev/null
+++ b/extensions/contact_sheet/data/ui/meson.build
@@ -0,0 +1,6 @@
+ui_files = files(
+  'contact-sheet.ui',
+  'contact-sheet-theme-properties.ui',
+  'image-wall.ui'
+)
+install_data(ui_files, install_dir : ui_install_dir)
diff --git a/extensions/contact_sheet/gth-contact-sheet-theme.c 
b/extensions/contact_sheet/gth-contact-sheet-theme.c
index 119e83a..34b2ef2 100644
--- a/extensions/contact_sheet/gth-contact-sheet-theme.c
+++ b/extensions/contact_sheet/gth-contact-sheet-theme.c
@@ -23,7 +23,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gthumb.h>
-#include "enum-types.h"
+#include "contact-sheet-enum-types.h"
 #include "gth-contact-sheet-theme.h"
 
 
diff --git a/extensions/contact_sheet/meson.build b/extensions/contact_sheet/meson.build
new file mode 100644
index 0000000..85c4de9
--- /dev/null
+++ b/extensions/contact_sheet/meson.build
@@ -0,0 +1,54 @@
+header_files = [
+  'actions.h',
+  'callbacks.h',
+  'dlg-contact-sheet.h',
+  'dlg-image-wall.h',
+  'gth-contact-sheet-creator.h',
+  'gth-contact-sheet-theme.h',
+  'gth-contact-sheet-theme-dialog.h',
+  'preferences.h'
+]
+
+enum_files = gnome.mkenums_simple('contact-sheet-enum-types', sources: header_files)
+
+source_files = files(
+  'actions.c',
+  'callbacks.c',
+  'dlg-contact-sheet.c',
+  'dlg-image-wall.c',
+  'gth-contact-sheet-creator.c',
+  'gth-contact-sheet-theme.c',
+  'gth-contact-sheet-theme-dialog.c',
+  'main.c'
+)
+
+shared_module('contact_sheet', 
+  sources : [ source_files, enum_files ],
+  dependencies : [ extension_common_deps, gstreamer_deps ],
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with: [ image_rotation_mod, export_tools_mod ],
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'contact_sheet.extension.in.in',
+  output : 'contact_sheet.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'contact_sheet.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')
diff --git a/extensions/convert_format/convert_format.extension.in.in 
b/extensions/convert_format/convert_format.extension.in.in
index 36ded39..eab2506 100644
--- a/extensions/convert_format/convert_format.extension.in.in
+++ b/extensions/convert_format/convert_format.extension.in.in
@@ -1,12 +1,12 @@
 [Extension]
-_Name=Convert format
-_Description=Save images in a different format
-_Authors=gthumb development team
+Name=Convert format
+Comment=Save images in a different format
+Authors=gthumb development team
 Copyright=Copyright © 2010-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
+Version=@GTHUMB_VERSION@
 Category=List-Tool
 
 [Loader]
 Type=module
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 Requires=list_tools
diff --git a/extensions/convert_format/data/meson.build b/extensions/convert_format/data/meson.build
new file mode 100644
index 0000000..36e5b29
--- /dev/null
+++ b/extensions/convert_format/data/meson.build
@@ -0,0 +1 @@
+subdir('ui')
diff --git a/extensions/convert_format/data/ui/meson.build b/extensions/convert_format/data/ui/meson.build
new file mode 100644
index 0000000..9fe496d
--- /dev/null
+++ b/extensions/convert_format/data/ui/meson.build
@@ -0,0 +1 @@
+install_data('convert-format.ui', install_dir : ui_install_dir)
diff --git a/extensions/convert_format/meson.build b/extensions/convert_format/meson.build
new file mode 100644
index 0000000..3fa9b2a
--- /dev/null
+++ b/extensions/convert_format/meson.build
@@ -0,0 +1,37 @@
+
+source_files = files(
+  'actions.c',
+  'callbacks.c',
+  'dlg-convert-format.c',
+  'main.c'
+)
+
+shared_module('convert_format', 
+  sources : source_files,
+  dependencies : extension_common_deps,
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'convert_format.extension.in.in',
+  output : 'convert_format.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'convert_format.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')
diff --git a/extensions/facebook/data/meson.build b/extensions/facebook/data/meson.build
new file mode 100644
index 0000000..36e5b29
--- /dev/null
+++ b/extensions/facebook/data/meson.build
@@ -0,0 +1 @@
+subdir('ui')
diff --git a/extensions/facebook/data/ui/meson.build b/extensions/facebook/data/ui/meson.build
new file mode 100644
index 0000000..1c84af9
--- /dev/null
+++ b/extensions/facebook/data/ui/meson.build
@@ -0,0 +1,6 @@
+ui_files = files(
+  'export-to-facebook.ui',
+  'facebook-album-properties.ui',
+  'import-from-facebook.ui'
+)
+install_data(ui_files, install_dir : ui_install_dir)
diff --git a/extensions/facebook/facebook.extension.in.in b/extensions/facebook/facebook.extension.in.in
index 5bd2b0b..f9db08a 100644
--- a/extensions/facebook/facebook.extension.in.in
+++ b/extensions/facebook/facebook.extension.in.in
@@ -1,13 +1,12 @@
 [Extension]
-_Name=Facebook
-_Description=Upload images to Facebook
-_Authors=gthumb development team
+Name=Facebook
+Comment=Upload images to Facebook
+Authors=gthumb development team
 Copyright=Copyright © 2010-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
-Icon=site-facebook
+Version=@GTHUMB_VERSION@
 Category=Exporter
 
 [Loader]
 Type=module
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 Requires=photo_importer;export_tools;oauth
diff --git a/extensions/facebook/meson.build b/extensions/facebook/meson.build
new file mode 100644
index 0000000..7dbf424
--- /dev/null
+++ b/extensions/facebook/meson.build
@@ -0,0 +1,54 @@
+
+source_files = files(
+  'actions.c',
+  'callbacks.c',
+  'dlg-export-to-facebook.c',
+  'dlg-import-from-facebook.c',
+  'facebook-album.c',
+  'facebook-album-properties-dialog.c',
+  'facebook-photo.c',
+  'facebook-service.c',
+  'main.c'
+)
+
+shared_module('facebook', 
+  sources : source_files,
+  dependencies : [
+    extension_common_deps,
+    libsoup_dep,
+    libjson_glib_dep,
+    webkit2_dep,
+    use_libsecret ? libsecret_dep : [],    
+  ],
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with : [
+    oauth_mod,
+    export_tools_mod,
+    photo_importer_mod,
+    importer_mod
+  ],
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'facebook.extension.in.in',
+  output : 'facebook.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'facebook.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')
diff --git a/extensions/flicker/flicker.extension.in.in b/extensions/flicker/flicker.extension.in.in
index 3565d24..3c7e85a 100644
--- a/extensions/flicker/flicker.extension.in.in
+++ b/extensions/flicker/flicker.extension.in.in
@@ -1,13 +1,12 @@
 [Extension]
-_Name=Flicker
-_Description=Upload images to Flickr
-_Authors=gthumb development team
+Name=Flicker
+Comment=Upload images to Flickr
+Authors=gthumb development team
 Copyright=Copyright © 2010-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
-Icon=site-flickr
+Version=@GTHUMB_VERSION@
 Category=Exporter
 
 [Loader]
 Type=module
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 Requires=photo_importer;export_tools;flicker_utils
diff --git a/extensions/flicker/meson.build b/extensions/flicker/meson.build
new file mode 100644
index 0000000..7d27ecc
--- /dev/null
+++ b/extensions/flicker/meson.build
@@ -0,0 +1,42 @@
+
+source_files = files(
+  'actions.c',
+  'callbacks.c',
+  'main.c'
+)
+
+shared_module('flicker', 
+  sources : source_files,
+  dependencies : [
+    extension_common_deps,
+    libsoup_dep,
+    use_libsecret ? libsecret_dep : [],    
+  ],
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with : [
+    flicker_utils_mod,
+    photo_importer_mod,
+    export_tools_mod,
+    importer_mod
+  ],
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'flicker.extension.in.in',
+  output : 'flicker.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'flicker.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
diff --git a/extensions/flicker_utils/data/meson.build b/extensions/flicker_utils/data/meson.build
new file mode 100644
index 0000000..36e5b29
--- /dev/null
+++ b/extensions/flicker_utils/data/meson.build
@@ -0,0 +1 @@
+subdir('ui')
diff --git a/extensions/flicker_utils/data/ui/meson.build b/extensions/flicker_utils/data/ui/meson.build
new file mode 100644
index 0000000..b5f8645
--- /dev/null
+++ b/extensions/flicker_utils/data/ui/meson.build
@@ -0,0 +1,5 @@
+ui_files = files(
+  'export-to-flickr.ui',
+  'import-from-flickr.ui'
+)
+install_data(ui_files, install_dir : ui_install_dir)
diff --git a/extensions/flicker_utils/flicker_utils.extension.in.in 
b/extensions/flicker_utils/flicker_utils.extension.in.in
index edba346..77cbe5e 100644
--- a/extensions/flicker_utils/flicker_utils.extension.in.in
+++ b/extensions/flicker_utils/flicker_utils.extension.in.in
@@ -3,5 +3,5 @@ Hidden=true
 
 [Loader]
 Type=module
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 Requires=importer;export_tools;oauth
diff --git a/extensions/flicker_utils/meson.build b/extensions/flicker_utils/meson.build
new file mode 100644
index 0000000..f3834a0
--- /dev/null
+++ b/extensions/flicker_utils/meson.build
@@ -0,0 +1,50 @@
+
+source_files = files(
+  'dlg-export-to-flickr.c',
+  'dlg-import-from-flickr.c',
+  'flickr-account.c',
+  'flickr-consumer.c',
+  'flickr-photo.c',
+  'flickr-photoset.c',
+  'flickr-service.c',
+  'main.c'
+)
+
+flicker_utils_mod = shared_module('flicker_utils', 
+  sources : source_files,
+  dependencies : [
+    extension_common_deps,
+    libsoup_dep,
+    use_libsecret ? libsecret_dep : [],    
+  ],
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with : [
+    oauth_mod,
+    export_tools_mod,
+    importer_mod
+  ],
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'flicker_utils.extension.in.in',
+  output : 'flicker_utils.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'flicker_utils.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')
diff --git a/extensions/importer/meson.build b/extensions/importer/meson.build
index 8e2514f..1a8fe07 100644
--- a/extensions/importer/meson.build
+++ b/extensions/importer/meson.build
@@ -30,6 +30,8 @@ importer_mod = shared_module('importer',
   install_dir : extensions_install_dir
 )
 
+importer_inc = include_directories('.')
+
 # .extension file
 
 extension_in_file = configure_file(
diff --git a/extensions/list_tools/meson.build b/extensions/list_tools/meson.build
index 609ccd2..cb6b6d0 100644
--- a/extensions/list_tools/meson.build
+++ b/extensions/list_tools/meson.build
@@ -11,7 +11,7 @@ source_files = files(
 
 gresource_files = gnome.compile_resources('list-tools-resources', 'resources.xml', c_name : 'gth')
 
-shared_module('list_tools', 
+list_tools_mod = shared_module('list_tools', 
   sources : [ source_files, gresource_files ],
   dependencies : extension_common_deps,
   include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/meson.build b/extensions/meson.build
index 7346c18..ac75a10 100644
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -23,37 +23,37 @@ subdir('importer')
 
 # list tools
 subdir('list_tools')
-#subdir('change_date')
-#subdir('convert_format')
-#subdir('rename_series')
-#subdir('resize_images')
+subdir('change_date')
+subdir('convert_format')
+subdir('rename_series')
+subdir('resize_images')
 
 # importers 
 subdir('photo_importer')
   
 # exporters
 subdir('export_tools')
-#subdir('burn_disc')
-#subdir('contact_sheet')
+subdir('burn_disc')
+subdir('contact_sheet')
 if with_webservices
-  #subdir('oauth')
-  #subdir('facebook')  
+  subdir('oauth')
+  subdir('facebook')  
 
   # flickr exporters
-  #subdir('flicker_utils')
-  #subdir('23hq')
-  #subdir('flicker')
+  subdir('flicker_utils')
+  subdir('23hq')
+  subdir('flicker')
 
-  #subdir('photobucket')
-  #subdir('picasaweb')
+  subdir('photobucket')
+  subdir('picasaweb')
 endif
 if with_webalbums
-  #subdir('webalbums')
+  subdir('webalbums')
 endif
 
 # file tools
 subdir('file_tools')
-#subdir('red_eye_removal')
+subdir('red_eye_removal')
 
 # other tools
 subdir('bookmarks')
diff --git a/extensions/oauth/data/meson.build b/extensions/oauth/data/meson.build
new file mode 100644
index 0000000..36e5b29
--- /dev/null
+++ b/extensions/oauth/data/meson.build
@@ -0,0 +1 @@
+subdir('ui')
diff --git a/extensions/oauth/data/ui/meson.build b/extensions/oauth/data/ui/meson.build
new file mode 100644
index 0000000..99bcd8b
--- /dev/null
+++ b/extensions/oauth/data/ui/meson.build
@@ -0,0 +1,6 @@
+ui_files = files(
+  'oauth-account-chooser.ui',
+  'oauth-account-manager.ui',
+  'oauth-ask-authorization.ui'
+)
+install_data(ui_files, install_dir : ui_install_dir)
diff --git a/extensions/oauth/meson.build b/extensions/oauth/meson.build
new file mode 100644
index 0000000..57e6b96
--- /dev/null
+++ b/extensions/oauth/meson.build
@@ -0,0 +1,47 @@
+
+source_files = files(
+  'main.c',
+  'oauth-ask-authorization-dialog.c',
+  'oauth-account.c',
+  'oauth-account-chooser-dialog.c',
+  'oauth-account-manager-dialog.c',
+  'oauth-consumer.c',
+  'oauth-service.c',
+  'web-service.c'
+)
+
+oauth_mod = shared_module('oauth', 
+  sources : source_files,
+  dependencies : [
+    extension_common_deps,
+    jpeg_deps,
+    libsoup_dep,
+    webkit2_dep,
+    use_libsecret ? libsecret_dep : [],    
+  ],
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'oauth.extension.in.in',
+  output : 'oauth.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'oauth.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')
diff --git a/extensions/oauth/oauth.extension.in.in b/extensions/oauth/oauth.extension.in.in
index 1beafb9..d6f2b8c 100644
--- a/extensions/oauth/oauth.extension.in.in
+++ b/extensions/oauth/oauth.extension.in.in
@@ -3,4 +3,4 @@ Hidden=true
 
 [Loader]
 Type=module
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
diff --git a/extensions/photo_importer/meson.build b/extensions/photo_importer/meson.build
index 1c21d07..a30f000 100644
--- a/extensions/photo_importer/meson.build
+++ b/extensions/photo_importer/meson.build
@@ -8,7 +8,7 @@ source_files = files(
 
 gresource_files = gnome.compile_resources('photo-importer-resources', 'resources.xml', c_name : 'gth')
 
-shared_module('photo_importer', 
+photo_importer_mod = shared_module('photo_importer', 
   sources : [ source_files, gresource_files ],
   dependencies : extension_common_deps,
   include_directories : [ config_inc, gthumb_inc ],
diff --git a/extensions/photobucket/data/meson.build b/extensions/photobucket/data/meson.build
new file mode 100644
index 0000000..36e5b29
--- /dev/null
+++ b/extensions/photobucket/data/meson.build
@@ -0,0 +1 @@
+subdir('ui')
diff --git a/extensions/photobucket/data/ui/meson.build b/extensions/photobucket/data/ui/meson.build
new file mode 100644
index 0000000..31d457e
--- /dev/null
+++ b/extensions/photobucket/data/ui/meson.build
@@ -0,0 +1,5 @@
+ui_files = files(
+  'export-to-photobucket.ui',
+  'photobucket-album-properties.ui'
+)
+install_data(ui_files, install_dir : ui_install_dir)
diff --git a/extensions/photobucket/meson.build b/extensions/photobucket/meson.build
new file mode 100644
index 0000000..230ff03
--- /dev/null
+++ b/extensions/photobucket/meson.build
@@ -0,0 +1,51 @@
+
+source_files = files(
+  'actions.c',
+  'callbacks.c',
+  'dlg-export-to-photobucket.c',
+  'main.c',
+  'photobucket-account.c',
+  'photobucket-album.c',
+  'photobucket-album-properties-dialog.c',
+  'photobucket-consumer.c',
+  'photobucket-photo.c',
+  'photobucket-service.c'
+)
+
+shared_module('photobucket', 
+  sources : source_files,
+  dependencies : [
+    extension_common_deps,
+    libsoup_dep,
+    use_libsecret ? libsecret_dep : [],    
+  ],
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with : [
+    oauth_mod,
+    export_tools_mod
+  ],
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'photobucket.extension.in.in',
+  output : 'photobucket.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'photobucket.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')
diff --git a/extensions/picasaweb/data/meson.build b/extensions/picasaweb/data/meson.build
new file mode 100644
index 0000000..36e5b29
--- /dev/null
+++ b/extensions/picasaweb/data/meson.build
@@ -0,0 +1 @@
+subdir('ui')
diff --git a/extensions/picasaweb/data/ui/meson.build b/extensions/picasaweb/data/ui/meson.build
new file mode 100644
index 0000000..9d09ab4
--- /dev/null
+++ b/extensions/picasaweb/data/ui/meson.build
@@ -0,0 +1,6 @@
+ui_files = files(
+  'export-to-picasaweb.ui',
+  'import-from-picasaweb.ui',
+  'picasa-web-album-properties.ui'
+)
+install_data(ui_files, install_dir : ui_install_dir)
diff --git a/extensions/picasaweb/meson.build b/extensions/picasaweb/meson.build
new file mode 100644
index 0000000..81c0bc5
--- /dev/null
+++ b/extensions/picasaweb/meson.build
@@ -0,0 +1,52 @@
+
+source_files = files(
+  'actions.c',
+  'callbacks.c',
+  'dlg-export-to-picasaweb.c',
+  'dlg-import-from-picasaweb.c',
+  'main.c',
+  'picasa-album-properties-dialog.c',
+  'picasa-web-album.c',
+  'picasa-web-photo.c',
+  'picasa-web-service.c'
+)
+
+shared_module('picasaweb', 
+  sources : source_files,
+  dependencies : [
+    extension_common_deps,
+    libsoup_dep,
+    libjson_glib_dep,
+    use_libsecret ? libsecret_dep : [],    
+  ],
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with : [
+    importer_mod,
+    export_tools_mod,
+    oauth_mod,
+  ],
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'picasaweb.extension.in.in',
+  output : 'picasaweb.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'picasaweb.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')
diff --git a/extensions/picasaweb/picasaweb.extension.in.in b/extensions/picasaweb/picasaweb.extension.in.in
index 324fcbb..7066447 100644
--- a/extensions/picasaweb/picasaweb.extension.in.in
+++ b/extensions/picasaweb/picasaweb.extension.in.in
@@ -1,13 +1,12 @@
 [Extension]
-_Name=Picasa Web Albums
-_Description=Upload images to Picasa Web Albums
-_Authors=gthumb development team
+Name=Picasa Web Albums
+Comment=Upload images to Picasa Web Albums
+Authors=gthumb development team
 Copyright=Copyright © 2010-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
-Icon=site-picasaweb
+Version=@GTHUMB_VERSION@
 Category=Exporter
 
 [Loader]
 Type=module
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 Requires=importer;export_tools;oauth
diff --git a/extensions/red_eye_removal/data/meson.build b/extensions/red_eye_removal/data/meson.build
new file mode 100644
index 0000000..36e5b29
--- /dev/null
+++ b/extensions/red_eye_removal/data/meson.build
@@ -0,0 +1 @@
+subdir('ui')
diff --git a/extensions/red_eye_removal/data/ui/meson.build b/extensions/red_eye_removal/data/ui/meson.build
new file mode 100644
index 0000000..2481b67
--- /dev/null
+++ b/extensions/red_eye_removal/data/ui/meson.build
@@ -0,0 +1,4 @@
+ui_files = files(
+  'red-eye-removal-options.ui'
+)
+install_data(ui_files, install_dir : ui_install_dir)
diff --git a/extensions/red_eye_removal/meson.build b/extensions/red_eye_removal/meson.build
new file mode 100644
index 0000000..cbd6fc1
--- /dev/null
+++ b/extensions/red_eye_removal/meson.build
@@ -0,0 +1,35 @@
+source_files = files(
+  'gth-file-tool-red-eye.c',
+  'main.c'
+)
+
+shared_module('red_eye_removal', 
+  sources : source_files,
+  dependencies : [ extension_common_deps ],
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with: [ image_viewer_mod ],
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'red_eye_removal.extension.in.in',
+  output : 'red_eye_removal.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'red_eye_removal.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')
diff --git a/extensions/red_eye_removal/red_eye_removal.extension.in.in 
b/extensions/red_eye_removal/red_eye_removal.extension.in.in
index a0d474e..2358c39 100644
--- a/extensions/red_eye_removal/red_eye_removal.extension.in.in
+++ b/extensions/red_eye_removal/red_eye_removal.extension.in.in
@@ -1,12 +1,12 @@
 [Extension]
-_Name=Red-eye removal
-_Description=Tool to remove the red-eye effect from a photo.
-_Authors=gthumb development team
+Name=Red-eye removal
+Comment=Tool to remove the red-eye effect from a photo.
+Authors=gthumb development team
 Copyright=Copyright © 2009-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
+Version=@GTHUMB_VERSION@
 Category=File-Tool
 
 [Loader]
 Type=module
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 Requires=image_viewer;file_tools
diff --git a/extensions/rename_series/data/meson.build b/extensions/rename_series/data/meson.build
new file mode 100644
index 0000000..36e5b29
--- /dev/null
+++ b/extensions/rename_series/data/meson.build
@@ -0,0 +1 @@
+subdir('ui')
diff --git a/extensions/rename_series/data/ui/meson.build b/extensions/rename_series/data/ui/meson.build
new file mode 100644
index 0000000..aa7a03d
--- /dev/null
+++ b/extensions/rename_series/data/ui/meson.build
@@ -0,0 +1 @@
+install_data('code-selector.ui', 'rename-series.ui', install_dir : ui_install_dir)
diff --git a/extensions/rename_series/meson.build b/extensions/rename_series/meson.build
new file mode 100644
index 0000000..7f95064
--- /dev/null
+++ b/extensions/rename_series/meson.build
@@ -0,0 +1,39 @@
+
+source_files = files(
+  'callbacks.c',
+  'dlg-rename-series.c',
+  'gth-rename-task.c',
+  'gth-template-editor-dialog.c',
+  'gth-template-selector.c',
+  'main.c'
+)
+
+shared_module('rename_series', 
+  sources : source_files,
+  dependencies : extension_common_deps,
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'rename_series.extension.in.in',
+  output : 'rename_series.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'rename_series.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')
diff --git a/extensions/rename_series/rename_series.extension.in.in 
b/extensions/rename_series/rename_series.extension.in.in
index 14f42e5..da29806 100644
--- a/extensions/rename_series/rename_series.extension.in.in
+++ b/extensions/rename_series/rename_series.extension.in.in
@@ -1,12 +1,12 @@
 [Extension]
-_Name=Rename files
-_Description=Rename series of files.
-_Authors=gthumb development team
+Name=Rename files
+Comment=Rename series of files.
+Authors=gthumb development team
 Copyright=Copyright © 2009-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
+Version=@GTHUMB_VERSION@
 Category=List-Tool
 
 [Loader]
 Type=module
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 Requires=file_manager
diff --git a/extensions/resize_images/data/meson.build b/extensions/resize_images/data/meson.build
new file mode 100644
index 0000000..36e5b29
--- /dev/null
+++ b/extensions/resize_images/data/meson.build
@@ -0,0 +1 @@
+subdir('ui')
diff --git a/extensions/resize_images/data/ui/meson.build b/extensions/resize_images/data/ui/meson.build
new file mode 100644
index 0000000..1ef7012
--- /dev/null
+++ b/extensions/resize_images/data/ui/meson.build
@@ -0,0 +1 @@
+install_data('resize-images.ui', install_dir : ui_install_dir)
diff --git a/extensions/resize_images/meson.build b/extensions/resize_images/meson.build
new file mode 100644
index 0000000..93027e6
--- /dev/null
+++ b/extensions/resize_images/meson.build
@@ -0,0 +1,38 @@
+
+source_files = files(
+  'actions.c',
+  'callbacks.c',
+  'dlg-resize-images.c',
+  'main.c'
+)
+
+shared_module('resize_images', 
+  sources : source_files,
+  dependencies : extension_common_deps,
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with : image_viewer_mod,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'resize_images.extension.in.in',
+  output : 'resize_images.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'resize_images.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')
diff --git a/extensions/resize_images/resize_images.extension.in.in 
b/extensions/resize_images/resize_images.extension.in.in
index f228953..0001f37 100644
--- a/extensions/resize_images/resize_images.extension.in.in
+++ b/extensions/resize_images/resize_images.extension.in.in
@@ -1,12 +1,12 @@
 [Extension]
-_Name=Resize images
-_Description=Resize series of images.
-_Authors=gthumb development team
+Name=Resize images
+Comment=Resize series of images.
+Authors=gthumb development team
 Copyright=Copyright © 2009-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
+Version=@GTHUMB_VERSION@
 Category=List-Tool
 
 [Loader]
 Type=module
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 Requires=image_viewer;list_tools
diff --git a/extensions/webalbums/data/albumthemes/meson.build 
b/extensions/webalbums/data/albumthemes/meson.build
new file mode 100644
index 0000000..48476bf
--- /dev/null
+++ b/extensions/webalbums/data/albumthemes/meson.build
@@ -0,0 +1,10 @@
+themes = [
+  'Classic',
+  'ClassicClips',
+  'NeatRound',
+  'Wiki'
+]
+
+foreach t : themes
+  install_subdir(t, install_dir : join_paths(pkgdatadir, 'albumthemes'))
+endforeach
diff --git a/extensions/webalbums/data/albumthemes/text.h b/extensions/webalbums/data/albumthemes/text.h
index 8a0e12e..e2982de 100644
--- a/extensions/webalbums/data/albumthemes/text.h
+++ b/extensions/webalbums/data/albumthemes/text.h
@@ -36,4 +36,4 @@ static char *text[] = {
        N_("View the previous image"),
        N_("View the previous page"),
        NULL
-}
+};
diff --git a/extensions/webalbums/data/albumthemes/update-text-h.rb 
b/extensions/webalbums/data/albumthemes/update-text-h.rb
index 6bf0198..f577b0c 100644
--- a/extensions/webalbums/data/albumthemes/update-text-h.rb
+++ b/extensions/webalbums/data/albumthemes/update-text-h.rb
@@ -43,5 +43,5 @@ end
 
 puts <<EOF
 \tNULL
-}
+};
 EOF
diff --git a/extensions/webalbums/data/meson.build b/extensions/webalbums/data/meson.build
new file mode 100644
index 0000000..55ac70d
--- /dev/null
+++ b/extensions/webalbums/data/meson.build
@@ -0,0 +1,2 @@
+subdir('albumthemes')
+subdir('ui')
diff --git a/extensions/webalbums/data/ui/meson.build b/extensions/webalbums/data/ui/meson.build
new file mode 100644
index 0000000..9f739fa
--- /dev/null
+++ b/extensions/webalbums/data/ui/meson.build
@@ -0,0 +1 @@
+install_data('web-album-exporter.ui', install_dir : ui_install_dir)
diff --git a/extensions/webalbums/meson.build b/extensions/webalbums/meson.build
new file mode 100644
index 0000000..a1f2e41
--- /dev/null
+++ b/extensions/webalbums/meson.build
@@ -0,0 +1,53 @@
+
+source_files = files(
+  'actions.c',
+  'albumtheme-private.c',
+  'callbacks.c',
+  'dlg-web-exporter.c',
+  'gth-web-exporter.c',
+  'main.c'
+)
+
+albumtheme_lexer = custom_target('albumtheme_lexer',
+  input : 'albumtheme.l',
+  output : 'albumtheme-lex.c',
+  command : [ flex, '-Pgth_albumtheme_yy', '-o@OUTPUT@', '@INPUT@' ]
+)
+
+albumtheme_parser = custom_target('albumtheme_parser',
+   input : 'albumtheme.y',
+   output : 'albumtheme.c',
+   command : [ bison, '@INPUT@', '-pgth_albumtheme_yy', '-o@OUTPUT@' ],
+   depends : albumtheme_lexer
+)
+ 
+shared_module('webalbums', 
+  sources : [ source_files, albumtheme_parser ],
+  dependencies : extension_common_deps,
+  include_directories : [ config_inc, gthumb_inc ],
+  c_args : c_args,
+  link_with : [ export_tools_mod, image_rotation_mod ],
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# .extension file
+
+extension_in_file = configure_file(
+  input : 'webalbums.extension.in.in',
+  output : 'webalbums.extension.in',
+  configuration : extension_data
+)
+
+i18n.merge_file(
+  input : extension_in_file,
+  output : 'webalbums.extension',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : extensions_install_dir
+)
+
+# Subdirectories
+
+subdir('data')
diff --git a/extensions/webalbums/webalbums.extension.in.in b/extensions/webalbums/webalbums.extension.in.in
index 6c36366..a1d6511 100644
--- a/extensions/webalbums/webalbums.extension.in.in
+++ b/extensions/webalbums/webalbums.extension.in.in
@@ -1,12 +1,12 @@
 [Extension]
-_Name=Web Albums
-_Description=Create static web albums.
-_Authors=gthumb development team
+Name=Web Albums
+Comment=Create static web albums.
+Authors=gthumb development team
 Copyright=Copyright © 2010-2013 The Free Software Foundation, Inc.
-Version=%VERSION%
+Version=@GTHUMB_VERSION@
 Category=Exporter
 
 [Loader]
 Type=module
-API=%GTHUMB_API_VERSION%
+API=@GTHUMB_API_VERSION@
 Requires=export_tools
diff --git a/meson.build b/meson.build
index 2082064..def8f44 100644
--- a/meson.build
+++ b/meson.build
@@ -43,11 +43,15 @@ if get_option('run-in-place')
   icons_data_dir = join_paths(meson.source_root(), 'data', 'icons')
   extensions_ui_data_dir = join_paths(meson.source_root(), 'extensions')
   extensions_data_dir = join_paths(meson.build_root(), 'extensions')
+  contact_sheet_data_dir = join_paths(meson.source_root(), 'extensions', 'contact_sheet', 'data')
+  webalbum_data_dir = join_paths(meson.source_root(), 'extensions', 'webalbums', 'data')
 else
   ui_data_dir = ui_install_dir
   icons_data_dir = icons_install_dir
   extensions_ui_data_dir = ui_data_dir
-  extensions_data_dir = extensions_install_dir  
+  extensions_data_dir = extensions_install_dir
+  contact_sheet_data_dir = pkgdatadir
+  webalbum_data_dir = pkgdatadir
 endif
 
 # Dependencies
@@ -222,6 +226,8 @@ config_data.set_quoted('GTHUMB_UI_DIR', ui_data_dir)
 config_data.set_quoted('GTHUMB_ICON_DIR', icons_data_dir)
 config_data.set_quoted('GTHUMB_EXTENSIONS_UI_DIR', extensions_ui_data_dir)
 config_data.set_quoted('GTHUMB_EXTENSIONS_DIR', extensions_data_dir)
+config_data.set_quoted('CONTACT_SHEET_DATADIR', contact_sheet_data_dir)
+config_data.set_quoted('WEBALBUM_DATADIR', webalbum_data_dir)
 if get_option('buildtype').contains('debug')
   config_data.set('DEBUG', 1)
 endif



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]