From f69250358a74efa5d7d9c562b2cdd80fad1430f1 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Mon, 18 Jun 2007 09:42:10 +0200 Subject: Add version info from git-describe A new script, gen-version.sh, is now invoked from 'make version' to generate the file VERSION. This file contains a version identifier generated by git-describe and is included in the Makefile. Signed-off-by: Lars Hjemli --- Makefile | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c2a5736..e69ad7e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,4 @@ -CGIT_VERSION = 0.5 - prefix = /var/www/htdocs/cgit - SHA1_HEADER = CACHE_ROOT = /var/cache/cgit CGIT_CONFIG = /etc/cgitrc @@ -12,6 +9,17 @@ CGIT_SCRIPT_NAME = cgit.cgi # -include cgit.conf + +CGIT_VERSION = 0.5 + +all: cgit + +VERSION: + gen-version.sh + +-include VERSION + + EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ @@ -42,12 +50,7 @@ INITGIT = ./submodules.sh -i endif -# -# basic build rules -# -all: cgit - -cgit: cgit.c cgit.h $(OBJECTS) +cgit: cgit.c cgit.h VERSION $(OBJECTS) $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) $(OBJECTS): cgit.h git/libgit.a @@ -65,7 +68,7 @@ install: all clean-cache install cgit.css $(prefix)/cgit.css clean-cgit: - rm -f cgit *.o + rm -f cgit VERSION *.o distclean-cgit: clean-cgit git clean -d -x @@ -83,5 +86,9 @@ clean: clean-cgit clean-sub distclean: distclean-cgit distclean-sub +version: clean-cgit + ./gen-version.sh + make + .PHONY: all install clean clean-cgit clean-sub clean-cache \ - distclean distclean-cgit distclean-sub + distclean distclean-cgit distclean-sub release version -- cgit 1.4.1