tools: Pass common_cflags to executables

diff --git a/gtk/tools/gtk-builder-tool-enumerate.c b/gtk/tools/gtk-builder-tool-enumerate.c
index c2428d918c850bff03d5b46919451de4e24c6478..9e4ef118bebe8b47d8901e5ca1ac018d339c8554 100644 (file)
--- 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 bac6c0b87169777e2c941e69a0db665bb542534c..473aabd558fcb9159b5a15569fffcee203bad7a9 100644 (file)
--- 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 af9d902f3f4b67bae429bd8b8e27466da4c275c2..228912ab5f143cd9abc9d900cdf4fa660e7e3750 100644 (file)
--- 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 ab74e507b8cc9d278210b3f1545a157f5bb2f633..38fdcdcc918f314ae984e4a3797a0bce0a8a1c26 100644 (file)
--- 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 080cf5bf9b6b7fc0b29a420345f6968b61ced153..e07cfb6218e1c53f8560b2ebcf8d5eda3a43aa3c 100644 (file)
--- 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 (file)
index 0000000..3d895d8
--- /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 e60a0bd38363aebc511624b76d5f360dcc8059c2..f769b29c9b3abc669a31753af9fe071d3408f59d 100644 (file)
--- 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)