add dynamic version to build via meson

remove unused arg in misc
mark arg as unused in addtax
update translations

src/addtax.c

@@ -4,11 +4,8 @@
 #include <locale.h>
 #include <stdbool.h>
 #include <getopt.h>
-#include "misc.h"
-
-#define _(STRING) gettext(STRING)
-#define TAX 1.111111111
-#define VERSION "1.0.1"
+#include "include/addtax.h"
+#include "include/misc.h"
 
 GtkLabel *calculated_value = NULL;
 
@@ -18,7 +15,7 @@ void calculate_tax(GtkWidget *entry) {
 	const gchar *label_text;
 	entry_text = (char*) gtk_entry_get_text(GTK_ENTRY(entry));
 	money = atof(entry_text);
-	if (is_float(entry_text, money)) {
+	if (is_float(entry_text)) {
 		g_print("$%d * %f = ", (int) round(money), TAX);
 		money = money * TAX;
 		g_print("$%d\n", (int) round(money));
@@ -56,7 +53,7 @@ int main(int argc, char *argv[]) {
 		// Process arguments that are not options
 		while (optind < argc) {
 			money = atof(argv[optind]);
-			if (is_float(argv[optind++], money)) {
+			if (is_float(argv[optind++])) {
 				printf("$%d * %f = ", (int) round(money), TAX);
 				money = money * TAX;
 				printf("$%d\n", (int) round(money));
@@ -96,7 +93,7 @@ int main(int argc, char *argv[]) {
 }
 
 // Called when calculate is clicked
-void on_button_calculate_clicked(GtkWidget *button, GtkWidget *entry) {
+void on_button_calculate_clicked(__attribute__((unused)) GtkWidget *button, GtkWidget *entry) {
 	calculate_tax(entry);
 }
 

src/include/addtax.h.in

@@ -0,0 +1,3 @@
+#define _(STRING) gettext(STRING)
+#define TAX 1.111111111
+#define VERSION "@version@"

src/include/meson.build

@@ -0,0 +1,5 @@
+conf_data = configuration_data()
+conf_data.set('version', meson.project_version())
+configure_file(input : 'addtax.h.in',
+	output : 'addtax.h',
+	configuration : conf_data)

src/include/misc.h

@@ -0,0 +1 @@
+bool is_float(const char *string);

src/meson.build

@@ -6,18 +6,25 @@ gmodule_dep = dependency('gmodule-export-2.0', version : '>=2.0')
 cc = meson.get_compiler('c')
 m_dep = cc.find_library('m', required : false)
 
-# -no-pie so that the executable is double clickable in gui
-c_args = ['-no-pie']
-link_args = ['-no-pie']
-
 sources = ['addtax.c']
 sources += ['misc.c']
-sources += ['misc.h']
 sources += [main_resource_c]
 
+# -no-pie so that the executable is double clickable in gui
+if cc.get_id() == 'gcc'
+	c_args = ['-no-pie']
+	link_args = ['-no-pie']
+else
+	c_args = ''
+	link_args = ''
+endif
+
+inc = include_directories('include')
+
 executable('addtax',
 	sources,
-	c_args : c_args,
-	link_args : link_args,
+	include_directories : inc,
+	c_args: c_args,
+	link_args: link_args,
 	dependencies : [gtk_dep, m_dep, gmodule_dep],
 	install : true)

src/misc.c

@@ -3,13 +3,13 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-bool is_float(const char *s, float dest) {
-	if (s == NULL) {
+bool is_float(const char *string) {
+	if (string == NULL) {
 		return false;
 	}
 	char *endptr;
-	dest = (float) strtod(s, &endptr);
-	if (s == endptr) {
+	strtod(string, &endptr);
+	if (string == endptr) {
 		return false;
 	}
 	while (isspace((unsigned char ) *endptr)) {

src/misc.h

@@ -1 +0,0 @@
-bool is_float(const char *s, float dest);