Start migrating to meson.

4 files changed, 53 insertions, 6 deletions

diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 0000000..374e79a
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,43 @@
+# for i in `ls *.c`; do echo "  '${i}',"; done
+zenity_sources = [
+  'about.c',
+  'calendar.c',
+  'color.c',
+  'entry.c',
+  'fileselection.c',
+  'forms.c',
+  'main.c',
+  'msg.c',
+  'notification.c',
+  'option.c',
+  'password.c',
+  'progress.c',
+  'scale.c',
+  'text.c',
+  'tree.c',
+  'util.c'
+]
+
+zenity_deps = [
+  gtk_dep,
+  libnotify
+]
+
+zenity_res = gnome.compile_resources(
+  'zenity-resources',
+  'zenity.gresource.xml',
+  c_name: 'zenity'
+)
+
+zenity_c_args = [
+  '-DG_LOG_DOMAIN="Zenity"'
+]
+
+zenity = executable(
+  meson.project_name(),
+  zenity_sources + zenity_res,
+  include_directories: zenity_root_dir,
+  dependencies: zenity_deps,
+  c_args: zenity_c_args,
+  install: true
+)
diff --git a/src/option.c b/src/option.c
index 1b67fad..ff78e69 100644
--- a/src/option.c
+++ b/src/option.c
@@ -28,6 +28,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <locale.h>
+#include <langinfo.h>
 
 #include <config.h>
 
diff --git a/src/option.h b/src/option.h
index ab76f1e..475f9ae 100644
--- a/src/option.h
+++ b/src/option.h
@@ -25,11 +25,9 @@
 #define OPTION_H
 
 #include "zenity.h"
+
 #include <glib.h>
-#include <langinfo.h>
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
+#include <config.h>
 
 typedef enum {
 	MODE_CALENDAR,
diff --git a/src/zenity.h b/src/zenity.h
index a7b59d9..449d022 100644
--- a/src/zenity.h
+++ b/src/zenity.h
@@ -1,9 +1,13 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 #ifndef ZENITY_H
 #define ZENITY_H
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include <config.h>
+
 G_BEGIN_DECLS
 
 typedef struct {
@@ -176,8 +180,8 @@ void zenity_progress (ZenityData *data, ZenityProgressData *progress_data);
 void zenity_text (ZenityData *data, ZenityTextData *text_data);
 void zenity_tree (ZenityData *data, ZenityTreeData *tree_data);
 #ifdef HAVE_LIBNOTIFY
-void zenity_notification (
-	ZenityData *data, ZenityNotificationData *notification_data);
+void zenity_notification (ZenityData *data,
+		ZenityNotificationData *notification_data);
 #endif
 
 void zenity_colorselection (