From 548e0a6bc35d4c776039f7467c0d67eabf9ef46a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matti=20Lehtim=C3=A4ki?= Date: Sun, 6 May 2012 23:46:40 +0300 Subject: Fix compiling with g++-4.7. Fix and improve Makefile. --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 95aa908..90871de 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,8 @@ PLUGIN = epgfixer ### The version number of this plugin (taken from the main source file): -VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g') +VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g') +GITTAG = $(shell git describe --always 2>/dev/null) ### The C++ compiler and options: @@ -55,6 +56,10 @@ INCLUDES += -I$(VDRDIR)/include DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +ifneq ($(strip $(GITTAG)),) +DEFINES += -DGITVERSION='"-GIT-$(GITTAG)"' +endif + ### The object files (add further files here): OBJS = $(PLUGIN).o charset.o config.o epghandler.o regexp.o setup_menu.o tools.o @@ -126,5 +131,4 @@ clean: @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot cppcheck: $(OBJS) - @cppcheck --enable=information,style,unusedFunction -v -f $(OBJS:%.o=%.c) - + @cppcheck --enable=information,style,unusedFunction -v -f $(OBJS:%.o=%.c) -- cgit v1.2.3