diff options
| author | Bert Münnich <ber.t@posteo.de> | 2018-06-09 11:33:30 +0200 |
|---|---|---|
| committer | Bert Münnich <ber.t@posteo.de> | 2018-06-09 11:33:30 +0200 |
| commit | 8bf1adcd9a61cba1bcc9d35ac0b86a0785d2a7bd (patch) | |
| tree | b538157bd5c08553152a73166891e65cc9dfdc78 /Makefile | |
| parent | b78aaee9d7412beedf47cbffda19cf874cff8eaf (diff) | |
New version scheme
VERSION string between releases is last release suffixed with '+'.
Additionally, use output of git-describe instead of VERSION string, if it is
not empty.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -1,4 +1,4 @@ -VERSION = git-20180411 +VERSION = 24+ srcdir = . VPATH = $(srcdir) @@ -20,7 +20,7 @@ HAVE_GIFLIB = 1 HAVE_LIBEXIF = 1 ALL_CFLAGS = $(DEF_CFLAGS) $(CFLAGS) -REQ_CPPFLAGS = -I. -D_XOPEN_SOURCE=700 -DVERSION=\"$(VERSION)\" \ +REQ_CPPFLAGS = -I. -D_XOPEN_SOURCE=700 \ -DHAVE_GIFLIB=$(HAVE_GIFLIB) -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) ALL_CPPFLAGS = $(REQ_CPPFLAGS) $(DEF_CPPFLAGS) $(CPPFLAGS) @@ -46,6 +46,7 @@ sxiv: $(OBJS) $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJS) $(LDLIBS) $(OBJS): Makefile sxiv.h commands.lst config.h +options.o: version.h window.o: icon/data.h .c.o: @@ -56,6 +57,14 @@ config.h: @echo "GEN $@" cp $(srcdir)/config.def.h $@ +version.h: Makefile .git/index + @echo "GEN $@" + VERSION="$$(cd $(srcdir); git describe 2>/dev/null)"; \ + [ -z "$$VERSION" ] && VERSION="$(VERSION)"; \ + echo "#define VERSION \"$$VERSION\"" >$@ + +.git/index: + clean: rm -f *.o sxiv |