about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2007-09-03 21:52:14 +0200
committerLars Hjemli2007-09-03 22:17:04 +0200
commite8920b52629911f92dbbecdb1d7675760e7a781e (patch)
treebd02d106cfee5823d7496f21756389c119a152dd
parentui-snapshot: whitespace/formatting cleanup (diff)
downloadcgit-e8920b52629911f92dbbecdb1d7675760e7a781e.tar.gz
cgit-e8920b52629911f92dbbecdb1d7675760e7a781e.zip
Rewrite the makefile + gen-version.sh
The old files were simply broken, hopefully the new ones will work out
somewhat better.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--Makefile98
-rwxr-xr-xgen-version.sh24
2 files changed, 55 insertions, 67 deletions
diff --git a/Makefile b/Makefile index 50d0011..12fd652 100644 --- a/Makefile +++ b/Makefile
@@ -1,8 +1,9 @@
1prefix = /var/www/htdocs/cgit 1CGIT_VERSION = v0.5
2SHA1_HEADER = <openssl/sha.h>
3CACHE_ROOT = /var/cache/cgit
4CGIT_CONFIG = /etc/cgitrc
5CGIT_SCRIPT_NAME = cgit.cgi 2CGIT_SCRIPT_NAME = cgit.cgi
3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_CONFIG = /etc/cgitrc
5CACHE_ROOT = /var/cache/cgit
6SHA1_HEADER = <openssl/sha.h>
6 7
7# 8#
8# Let the user override the above settings. 9# Let the user override the above settings.
@@ -10,85 +11,56 @@ CGIT_SCRIPT_NAME = cgit.cgi
10-include cgit.conf 11-include cgit.conf
11 12
12 13
13CGIT_VERSION = 0.5
14
15all: cgit
16
17VERSION:
18 sh gen-version.sh
19
20-include VERSION
21
22
23EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 14EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
24OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ 15OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
25 ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ 16 ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
26 ui-snapshot.o ui-blob.o ui-tag.o 17 ui-snapshot.o ui-blob.o ui-tag.o
27 18
28CFLAGS += -Wall
29 19
30ifdef DEBUG 20.PHONY: all git install clean distclean force-version
31 CFLAGS += -g 21
32endif 22all: cgit git
23
24VERSION: force-version
25 @./gen-version.sh "$(CGIT_VERSION)"
26-include VERSION
27
33 28
34CFLAGS += -Igit 29CFLAGS += -g -Wall -Igit
35CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' 30CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
36CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' 31CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
37CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' 32CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
38CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' 33CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
39 34
40 35
41# 36cgit: cgit.c $(OBJECTS)
42# If make is run on a nongit platform, get the git sources as a tarball.
43#
44GITVER = $(shell git version 2>/dev/null || echo nogit)
45ifeq ($(GITVER),nogit)
46GITURL = http://www.kernel.org/pub/software/scm/git/git-1.5.2.tar.bz2
47INITGIT = test -e git/git.c || ((curl "$(GITURL)" | tar -xj) && mv git-1.5.2 git)
48else
49INITGIT = ./submodules.sh -i
50endif
51
52
53cgit: cgit.c cgit.h VERSION $(OBJECTS)
54 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) 37 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
55 38
56$(OBJECTS): cgit.h git/libgit.a 39$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
57 40
58git/libgit.a: 41git/xdiff/lib.a: | git
59 $(INITGIT)
60 $(MAKE) -C git
61 42
62# 43git/libgit.a: | git
63# phony targets
64#
65install: all clean-cache
66 mkdir -p $(prefix)
67 install cgit $(prefix)/$(CGIT_SCRIPT_NAME)
68 install cgit.css $(prefix)/cgit.css
69 44
70clean-cgit: 45git:
71 rm -f cgit VERSION *.o 46 cd git && $(MAKE) xdiff/lib.a
47 cd git && $(MAKE) libgit.a
72 48
73distclean-cgit: clean-cgit 49install: all
74 git clean -d -x 50 mkdir -p $(CGIT_SCRIPT_PATH)
75 51 install cgit $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
76clean-sub: 52 install cgit.css $(CGIT_SCRIPT_PATH)/cgit.css
77 $(MAKE) -C git clean
78
79distclean-sub: clean-sub
80 $(shell cd git && git clean -d -x)
81
82clean-cache:
83 rm -rf $(CACHE_ROOT)/* 53 rm -rf $(CACHE_ROOT)/*
84 54
85clean: clean-cgit clean-sub 55uninstall:
56 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
57 rm -f $(CGIT_SCRIPT_PATH)/cgit.css
58 rm -rf $(CACHE_ROOT)
86 59
87distclean: distclean-cgit distclean-sub 60clean:
88 61 rm -f cgit VERSION *.o
89version: clean-cgit 62 cd git && $(MAKE) clean
90 ./gen-version.sh
91 make
92 63
93.PHONY: all install clean clean-cgit clean-sub clean-cache \ 64distclean: clean
94 distclean distclean-cgit distclean-sub release version 65 git clean -d -x
66 cd git && git clean -d -x
diff --git a/gen-version.sh b/gen-version.sh index 4c60f60..739c83e 100755 --- a/gen-version.sh +++ b/gen-version.sh
@@ -1,4 +1,20 @@
1v=$(git-describe --abbrev=4 HEAD | sed -e 's/-/./g') 1#!/bin/sh
2test -z "$v" && exit 1 2
3echo "CGIT_VERSION = $v" 3# Get version-info specified in Makefile
4echo "CGIT_VERSION = $v" > VERSION 4V=$1
5
6# Use `git describe` to get current version if we're inside a git repo
7if test -d .git
8then
9 V=$(git describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g')
10fi
11
12new="CGIT_VERSION = $V"
13old=$(cat VERSION 2>/dev/null)
14
15# Exit if VERSION is uptodate
16test "$old" = "$new" && exit 0
17
18# Update VERSION with new version-info
19echo "$new" > VERSION
20cat VERSION