diff options
author | Lars Hjemli | 2007-06-18 09:42:10 +0200 |
---|---|---|
committer | Lars Hjemli | 2007-06-18 10:38:40 +0200 |
commit | f69250358a74efa5d7d9c562b2cdd80fad1430f1 (patch) | |
tree | 19c0ddab227d1c27a49046e559618cd067169591 /Makefile | |
parent | Add cgit_diff_link() (diff) | |
download | cgit-f69250358a74efa5d7d9c562b2cdd80fad1430f1.tar.gz cgit-f69250358a74efa5d7d9c562b2cdd80fad1430f1.zip |
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 <hjemli@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/Makefile b/Makefile index c2a5736..e69ad7e 100644 --- a/Makefile +++ b/Makefile | |||
@@ -1,7 +1,4 @@ | |||
1 | CGIT_VERSION = 0.5 | ||
2 | |||
3 | prefix = /var/www/htdocs/cgit | 1 | prefix = /var/www/htdocs/cgit |
4 | |||
5 | SHA1_HEADER = <openssl/sha.h> | 2 | SHA1_HEADER = <openssl/sha.h> |
6 | CACHE_ROOT = /var/cache/cgit | 3 | CACHE_ROOT = /var/cache/cgit |
7 | CGIT_CONFIG = /etc/cgitrc | 4 | CGIT_CONFIG = /etc/cgitrc |
@@ -12,6 +9,17 @@ CGIT_SCRIPT_NAME = cgit.cgi | |||
12 | # | 9 | # |
13 | -include cgit.conf | 10 | -include cgit.conf |
14 | 11 | ||
12 | |||
13 | CGIT_VERSION = 0.5 | ||
14 | |||
15 | all: cgit | ||
16 | |||
17 | VERSION: | ||
18 | gen-version.sh | ||
19 | |||
20 | -include VERSION | ||
21 | |||
22 | |||
15 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 23 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
16 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ | 24 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ |
17 | ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ | 25 | ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ |
@@ -42,12 +50,7 @@ INITGIT = ./submodules.sh -i | |||
42 | endif | 50 | endif |
43 | 51 | ||
44 | 52 | ||
45 | # | 53 | cgit: cgit.c cgit.h VERSION $(OBJECTS) |
46 | # basic build rules | ||
47 | # | ||
48 | all: cgit | ||
49 | |||
50 | cgit: cgit.c cgit.h $(OBJECTS) | ||
51 | $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) | 54 | $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) |
52 | 55 | ||
53 | $(OBJECTS): cgit.h git/libgit.a | 56 | $(OBJECTS): cgit.h git/libgit.a |
@@ -65,7 +68,7 @@ install: all clean-cache | |||
65 | install cgit.css $(prefix)/cgit.css | 68 | install cgit.css $(prefix)/cgit.css |
66 | 69 | ||
67 | clean-cgit: | 70 | clean-cgit: |
68 | rm -f cgit *.o | 71 | rm -f cgit VERSION *.o |
69 | 72 | ||
70 | distclean-cgit: clean-cgit | 73 | distclean-cgit: clean-cgit |
71 | git clean -d -x | 74 | git clean -d -x |
@@ -83,5 +86,9 @@ clean: clean-cgit clean-sub | |||
83 | 86 | ||
84 | distclean: distclean-cgit distclean-sub | 87 | distclean: distclean-cgit distclean-sub |
85 | 88 | ||
89 | version: clean-cgit | ||
90 | ./gen-version.sh | ||
91 | make | ||
92 | |||
86 | .PHONY: all install clean clean-cgit clean-sub clean-cache \ | 93 | .PHONY: all install clean clean-cgit clean-sub clean-cache \ |
87 | distclean distclean-cgit distclean-sub | 94 | distclean distclean-cgit distclean-sub release version |