| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 29 | ||||
| -rw-r--r-- | cgit.c | 3 | ||||
| -rw-r--r-- | cgit.h | 2 | ||||
| -rwxr-xr-x | gen-version.sh | 4 | ||||
| -rw-r--r-- | shared.c | 2 | ||||
| -rw-r--r-- | ui-shared.c | 2 |
7 files changed, 16 insertions, 27 deletions
@@ -1,5 +1,4 @@ # Files I don't care to see in git-status/commit cgit -VERSION *.o *~ @@ -1,4 +1,7 @@ +CGIT_VERSION = 0.5 + prefix = /var/www/htdocs/cgit + SHA1_HEADER = <openssl/sha.h> CACHE_ROOT = /var/cache/cgit CGIT_CONFIG = /etc/cgitrc @@ -9,17 +12,6 @@ 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 \ @@ -50,7 +42,12 @@ INITGIT = ./submodules.sh -i endif -cgit: cgit.c cgit.h VERSION $(OBJECTS) +# +# basic build rules +# +all: cgit + +cgit: cgit.c cgit.h $(OBJECTS) $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) $(OBJECTS): cgit.h git/libgit.a @@ -68,7 +65,7 @@ install: all clean-cache install cgit.css $(prefix)/cgit.css clean-cgit: - rm -f cgit VERSION *.o + rm -f cgit *.o distclean-cgit: clean-cgit git clean -d -x @@ -86,9 +83,5 @@ 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 release version + distclean distclean-cgit distclean-sub @@ -8,6 +8,9 @@ #include "cgit.h" +const char cgit_version[] = CGIT_VERSION; + + static int cgit_prepare_cache(struct cacheitem *item) { if (!cgit_repo && cgit_query_repo) { @@ -98,7 +98,7 @@ struct taginfo { char *msg; }; -extern const char *cgit_version; +extern const char cgit_version[]; extern struct repolist cgit_repolist; extern struct repoinfo *cgit_repo; diff --git a/gen-version.sh b/gen-version.sh deleted file mode 100755 index 4c60f60..0000000 --- a/gen-version.sh +++ /dev/null @@ -1,4 +0,0 @@ -v=$(git-describe --abbrev=4 HEAD | sed -e 's/-/./g') -test -z "$v" && exit 1 -echo "CGIT_VERSION = $v" -echo "CGIT_VERSION = $v" > VERSION @@ -12,8 +12,6 @@ struct repolist cgit_repolist; struct repoinfo *cgit_repo; int cgit_cmd; -const char *cgit_version = CGIT_VERSION; - char *cgit_root_title = "Git repository browser"; char *cgit_css = "/cgit.css"; char *cgit_logo = "/git-logo.png"; diff --git a/ui-shared.c b/ui-shared.c index 110c696..15d8254 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -262,7 +262,7 @@ void cgit_print_docstart(char *title, struct cacheitem *item) html("<title>"); html_txt(title); html("</title>\n"); - htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); + htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version); html("<link rel='stylesheet' type='text/css' href='"); html_attr(cgit_css); html("'/>\n"); |