Added version information

dorneanu · Aug 24, 2013 · 2ccb5cf · 2ccb5cf
1 parent 97662c3
commit 2ccb5cf
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+*.o
+*.geany
+ixkeylog
diff --git a/Makefile.FreeBSD b/Makefile.FreeBSD
@@ -30,8 +30,11 @@ CC = gcc
 RM = rm -rf
 MV = mv
 
+# Add version to binary
+GIT_VERSION = $(shell sh -c 'git describe --abbrev=4 --always')
+
 # Flags
-CFLAGS = -W -Wall -O2 -I /usr/local/include
+CFLAGS = -W -Wall -O2 -I /usr/local/include -D__GIT_VERSION=\"$(GIT_VERSION)\"
 LDFLAGS =  -L /usr/local/lib -lX11 
 
 # Default (dir) locations

diff --git a/Makefile.Linux b/Makefile.Linux
@@ -30,8 +30,11 @@ CC = gcc
 RM = rm -rf
 MV = mv
 
+# Add version to binary
+GIT_VERSION = $(shell sh -c 'git describe --abbrev=4 --always')
+
 # Flags
-CFLAGS = -W -Wall -O2
+CFLAGS = -W -Wall -O2 -D__GIT_VERSION=\"$(GIT_VERSION)\"
 LDFLAGS = -lX11
 
 # Default (dir) locations

diff --git a/Makefile.NetBSD b/Makefile.NetBSD
@@ -30,8 +30,11 @@ CC = gcc
 RM = rm -rf
 MV = mv
 
+# Add version to binary
+GIT_VERSION = $(shell sh -c 'git describe --abbrev=4 --always')
+
 # Flags
-CFLAGS = -W -Wall -O2 -I /usr/pkg/include -I /usr/X11R7/include
+CFLAGS = -W -Wall -O2 -I /usr/pkg/include -I /usr/X11R7/include -D__GIT_VERSION=\"$(GIT_VERSION)\"
 LDFLAGS =  -L /usr/X11R7/lib -R /usr/X11R7/lib -lX11 
 
 # Default (dir) locations

diff --git a/Makefile.OpenBSD b/Makefile.OpenBSD
@@ -30,8 +30,11 @@ CC = gcc
 RM = rm -rf
 MV = mv
 
+# Add version to binary
+GIT_VERSION = $(shell sh -c 'git describe --abbrev=4 --always')
+
 # Flags
-CFLAGS = -W -Wall -O2  -I /usr/X11R6/include
+CFLAGS = -W -Wall -O2  -I /usr/X11R6/include -D__GIT_VERSION=\"$(GIT_VERSION)\"
 LDFLAGS =  -L /usr/X11R6/lib -R /usr/X11R6/lib -lX11 
 
 # Default (dir) locations

diff --git a/ixkeylog b/ixkeylog
diff --git a/src/args.o b/src/args.o
diff --git a/src/display.o b/src/display.o
diff --git a/src/ixkeylog.h b/src/ixkeylog.h
@@ -32,7 +32,7 @@
 
 #include "display.h"
 
-#define D_IXKEYLOG_VERSION    "0.1"
+#define D_IXKEYLOG_VERSION    __GIT_VERSION
 #define D_IXKEYLOG_AUTHOR     "Victor Dorneanu"
 
 

diff --git a/src/main.o b/src/main.o
diff --git a/src/signal.o b/src/signal.o