tools: Pass common_cflags to executables

7 files changed, 21 insertions, 12 deletions

diff --git a/gtk/tools/gtk-builder-tool-enumerate.c b/gtk/tools/gtk-builder-tool-enumerate.c
index c2428d918c..9e4ef118be 100644
--- a/gtk/tools/gtk-builder-tool-enumerate.c
+++ b/gtk/tools/gtk-builder-tool-enumerate.c
@@ -26,6 +26,7 @@
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include "gtkbuilderprivate.h"
+#include "gtk-builder-tool.h"
 
 static const gchar *
 object_get_name (GObject *object)
@@ -37,7 +38,7 @@ object_get_name (GObject *object)
 }
 
 void
-do_enumerate (int *argc, char ***argv)
+do_enumerate (int *argc, const char ***argv)
 {
   GtkBuilder *builder;
   GError *error = NULL;
diff --git a/gtk/tools/gtk-builder-tool-preview.c b/gtk/tools/gtk-builder-tool-preview.c
index bac6c0b871..473aabd558 100644
--- a/gtk/tools/gtk-builder-tool-preview.c
+++ b/gtk/tools/gtk-builder-tool-preview.c
@@ -26,6 +26,8 @@
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include "gtkbuilderprivate.h"
+#include "gtk-builder-tool.h"
+
 
 static void
 set_window_title (GtkWindow  *window,
diff --git a/gtk/tools/gtk-builder-tool-simplify.c b/gtk/tools/gtk-builder-tool-simplify.c
index af9d902f3f..228912ab5f 100644
--- a/gtk/tools/gtk-builder-tool-simplify.c
+++ b/gtk/tools/gtk-builder-tool-simplify.c
@@ -26,6 +26,7 @@
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include "gtkbuilderprivate.h"
+#include "gtk-builder-tool.h"
 
 typedef struct Element Element;
 struct Element {
@@ -1816,7 +1817,7 @@ dump_tree (MyParserData *data)
   dump_element (data->root, data->output, 0);
 }
 
-gboolean
+static gboolean
 simplify_file (const char *filename,
                gboolean    replace,
                gboolean    convert3to4)
diff --git a/gtk/tools/gtk-builder-tool-validate.c b/gtk/tools/gtk-builder-tool-validate.c
index ab74e507b8..38fdcdcc91 100644
--- a/gtk/tools/gtk-builder-tool-validate.c
+++ b/gtk/tools/gtk-builder-tool-validate.c
@@ -26,6 +26,7 @@
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include "gtkbuilderprivate.h"
+#include "gtk-builder-tool.h"
 
 static GType
 make_fake_type (const gchar *type_name,
@@ -147,7 +148,7 @@ validate_file (const char *filename)
 }
 
 void
-do_validate (int *argc, char ***argv)
+do_validate (int *argc, const char ***argv)
 {
   int i;
 
@@ -156,6 +157,4 @@ do_validate (int *argc, char ***argv)
       if (!validate_file ((*argv)[i]))
         exit (1);
     }
-
-  return;
 }
diff --git a/gtk/tools/gtk-builder-tool.c b/gtk/tools/gtk-builder-tool.c
index 080cf5bf9b..e07cfb6218 100644
--- a/gtk/tools/gtk-builder-tool.c
+++ b/gtk/tools/gtk-builder-tool.c
@@ -26,13 +26,9 @@
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include "gtkbuilderprivate.h"
+#include "gtk-builder-tool.h"
 
-extern void do_simplify  (int *argc, const char ***argv);
-extern void do_validate  (int *argc, const char ***argv);
-extern void do_enumerate (int *argc, const char ***argv);
-extern void do_preview   (int *argc, const char ***argv);
-
-static void
+static void G_GNUC_NORETURN
 usage (void)
 {
   g_print (_("Usage:\n"
diff --git a/gtk/tools/gtk-builder-tool.h b/gtk/tools/gtk-builder-tool.h
new file mode 100644
index 0000000000..3d895d83bb
--- /dev/null
+++ b/gtk/tools/gtk-builder-tool.h
@@ -0,0 +1,10 @@
+
+#ifndef __GTK_BUILDER_TOOL_H__
+#define __GTK_BUILDER_TOOL_H__
+
+void do_simplify  (int *argc, const char ***argv);
+void do_validate  (int *argc, const char ***argv);
+void do_enumerate (int *argc, const char ***argv);
+void do_preview   (int *argc, const char ***argv);
+
+#endif
diff --git a/gtk/tools/meson.build b/gtk/tools/meson.build
index e60a0bd383..f769b29c9b 100644
--- a/gtk/tools/meson.build
+++ b/gtk/tools/meson.build
@@ -20,7 +20,7 @@ foreach tool: gtk_tools
 
   exe = executable(tool_name, tool_srcs,
                    include_directories: [confinc],
-                   c_args: gtk_cargs,
+                   c_args: common_cflags,
                    dependencies: libgtk_dep,
                    install: true)