update

makefile

@@ -4,14 +4,16 @@
 # Makefile
 
 NAME := gtklock
+MAJOR_VERSION := 1
+MINOR_VERSION := 4
+MICRO_VERSION := 0
 
 PREFIX = /usr/local
 INSTALL = install
 
-include util/version.mk
-
 LIBS := pam wayland-client gtk+-wayland-3.0 gtk-layer-shell-0 gmodule-no-export-2.0
-CFLAGS += -std=c11 -DVERSION=$(VERSION) -DPREFIX=$(PREFIX) -Iinclude $(shell pkg-config --cflags $(LIBS))
+CFLAGS += -std=c11 -Iinclude -DPREFIX=$(PREFIX) $(shell pkg-config --cflags $(LIBS))
+CFLAGS += -DMAJOR_VERSION=$(MAJOR_VERSION) -DMINOR_VERSION=$(MINOR_VERSION) -DMICRO_VERSION=$(MICRO_VERSION)
 LDLIBS += -Wl,--export-dynamic $(shell pkg-config --libs $(LIBS))
 
 SRC = $(wildcard src/*.c) 

src/module.c

@@ -3,16 +3,25 @@
 
 // Module support
 
+#include "util.h"
 #include "module.h"
 
 #ifndef PREFIX
 #warning PREFIX not defined.
 #define PREFIX /usr/local
 #endif
 
-#ifndef VERSION
-#warning VERSION not defined.
-#define VERSION unknown
+#ifndef MAJOR_VERSION
+#warning MAJOR_VERSION not defined.
+#define MAJOR_VERSION 0
+#endif
+#ifndef MINOR_VERSION
+#warning MINOR_VERSION not defined.
+#define MINOR_VERSION 0
+#endif
+#ifndef MICRO_VERSION
+#warning MICRO_VERSION not defined.
+#define MICRO_VERSION 0
 #endif
 
 #define _STR(x) #x
@@ -40,11 +49,22 @@ GModule *module_load(const char *name) {
 		return NULL;
 	}
 
-	gchar *module_version = NULL;
-	if(g_module_symbol(module, "module_version", (gpointer *)&module_version)) {
-		if(g_strcmp0(STR(VERSION), module_version) != 0)
-			g_warning("%s: module has mismatched version, may be incompatible", name);
-	} else g_warning("%s: module has no version info, may be incompatible", name);
+	guint *major = NULL;
+	guint *minor = NULL;
+	gboolean has_major = g_module_symbol(module, "module_major_version", (gpointer *)&major);
+	gboolean has_minor = g_module_symbol(module, "module_minor_version", (gpointer *)&minor);
+	if(has_major && has_minor) {
+		if(*major != MAJOR_VERSION) report_error_and_exit("%s: module has mismatched major version (%u), is incompatible", name, *major);
+		else if(*minor != MINOR_VERSION) g_warning("%s: module has mismatched minor version (%u), may be incompatible", name, *minor);
+	}
+	else {
+		const gchar *gtklock_version = "v" STR(MAJOR_VERSION) "." STR(MINOR_VERSION) "." STR(MICRO_VERSION);
+		const gchar *module_version = NULL;
+		if(g_module_symbol(module, "module_version", (gpointer *)&module_version)) {
+			if(g_strcmp0(gtklock_version, module_version) != 0)
+				g_warning("%s: module has mismatched version, may be incompatible", name);
+		} else g_warning("%s: module has no version info, may be incompatible", name);
+	}
 
 	return module;
 }

src/source.c

@@ -16,9 +16,17 @@
 #include "module.h"
 #include "xdg.h"
 
-#ifndef VERSION
-#warning VERSION not defined.
-#define VERSION unknown
+#ifndef MAJOR_VERSION
+#warning MAJOR_VERSION not defined.
+#define MAJOR_VERSION 0
+#endif
+#ifndef MINOR_VERSION
+#warning MINOR_VERSION not defined.
+#define MINOR_VERSION 0
+#endif
+#ifndef MICRO_VERSION
+#warning MICRO_VERSION not defined.
+#define MICRO_VERSION 0
 #endif
 
 #define _STR(x) #x
@@ -263,7 +271,7 @@ int main(int argc, char **argv) {
 		report_error_and_exit("Option parsing failed: %s\n", error->message);
 
 	if(show_version) {
-		g_print("gtklock %s\n", STR(VERSION));
+		g_print("gtklock %s\n", "v" STR(MAJOR_VERSION) "." STR(MINOR_VERSION) "." STR(MICRO_VERSION));
 		return 0;
 	}