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>

2 files changed, 55 insertions, 67 deletions

diff --git a/Makefile b/Makefileindex 50d0011..12fd652 100644--- a/Makefile+++ b/Makefile@@ -1,8 +1,9 @@-prefix = /var/www/htdocs/cgit-SHA1_HEADER = <openssl/sha.h>-CACHE_ROOT = /var/cache/cgit-CGIT_CONFIG = /etc/cgitrc+CGIT_VERSION = v0.5 CGIT_SCRIPT_NAME = cgit.cgi+CGIT_SCRIPT_PATH = /var/www/htdocs/cgit+CGIT_CONFIG = /etc/cgitrc+CACHE_ROOT = /var/cache/cgit+SHA1_HEADER = <openssl/sha.h>  # # Let the user override the above settings.@@ -10,85 +11,56 @@ CGIT_SCRIPT_NAME = cgit.cgi -include cgit.conf  -CGIT_VERSION = 0.5--all: cgit--VERSION:-	sh 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 \ 	ui-snapshot.o ui-blob.o ui-tag.o -CFLAGS += -Wall -ifdef DEBUG-	CFLAGS += -g-endif+.PHONY: all git install clean distclean force-version++all: cgit git++VERSION: force-version+	@./gen-version.sh "$(CGIT_VERSION)"+-include VERSION+ -CFLAGS += -Igit+CFLAGS += -g -Wall -Igit CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'  -#-# If make is run on a nongit platform, get the git sources as a tarball.-#-GITVER = $(shell git version 2>/dev/null || echo nogit)-ifeq ($(GITVER),nogit)-GITURL = http://www.kernel.org/pub/software/scm/git/git-1.5.2.tar.bz2-INITGIT = test -e git/git.c || ((curl "$(GITURL)" | tar -xj) && mv git-1.5.2 git)-else-INITGIT = ./submodules.sh -i-endif---cgit: cgit.c cgit.h VERSION $(OBJECTS)+cgit: cgit.c $(OBJECTS) 	$(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) -$(OBJECTS): cgit.h git/libgit.a+$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION -git/libgit.a:-	$(INITGIT)-	$(MAKE) -C git+git/xdiff/lib.a: | git -#-# phony targets-#-install: all clean-cache-	mkdir -p $(prefix)-	install cgit $(prefix)/$(CGIT_SCRIPT_NAME)-	install cgit.css $(prefix)/cgit.css+git/libgit.a: | git -clean-cgit:-	rm -f cgit VERSION *.o+git:+	cd git && $(MAKE) xdiff/lib.a+	cd git && $(MAKE) libgit.a -distclean-cgit: clean-cgit-	git clean -d -x--clean-sub:-	$(MAKE) -C git clean--distclean-sub: clean-sub-	$(shell cd git && git clean -d -x)--clean-cache:+install: all+	mkdir -p $(CGIT_SCRIPT_PATH)+	install cgit $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)+	install cgit.css $(CGIT_SCRIPT_PATH)/cgit.css 	rm -rf $(CACHE_ROOT)/* -clean: clean-cgit clean-sub+uninstall:+	rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)+	rm -f $(CGIT_SCRIPT_PATH)/cgit.css+	rm -rf $(CACHE_ROOT) -distclean: distclean-cgit distclean-sub--version: clean-cgit-	./gen-version.sh-	make+clean:+	rm -f cgit VERSION *.o+	cd git && $(MAKE) clean -.PHONY: all install clean clean-cgit clean-sub clean-cache \-	distclean distclean-cgit distclean-sub release version+distclean: clean+	git clean -d -x+	cd git && git clean -d -x
diff --git a/Makefile b/Makefile
index 50d0011..12fd652 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
-prefix = /var/www/htdocs/cgit
-SHA1_HEADER = <openssl/sha.h>
-CACHE_ROOT = /var/cache/cgit
-CGIT_CONFIG = /etc/cgitrc
+CGIT_VERSION = v0.5
 CGIT_SCRIPT_NAME = cgit.cgi
+CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
+CGIT_CONFIG = /etc/cgitrc
+CACHE_ROOT = /var/cache/cgit
+SHA1_HEADER = <openssl/sha.h>
 
 #
 # Let the user override the above settings.
@@ -10,85 +11,56 @@ CGIT_SCRIPT_NAME = cgit.cgi
 -include cgit.conf
 
 
-CGIT_VERSION = 0.5
-
-all: cgit
-
-VERSION:
-	sh 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 \
 	ui-snapshot.o ui-blob.o ui-tag.o
 
-CFLAGS += -Wall
 
-ifdef DEBUG
-	CFLAGS += -g
-endif
+.PHONY: all git install clean distclean force-version
+
+all: cgit git
+
+VERSION: force-version
+	@./gen-version.sh "$(CGIT_VERSION)"
+-include VERSION
+
 
-CFLAGS += -Igit
+CFLAGS += -g -Wall -Igit
 CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
 CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
 CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 
 
-#
-# If make is run on a nongit platform, get the git sources as a tarball.
-#
-GITVER = $(shell git version 2>/dev/null || echo nogit)
-ifeq ($(GITVER),nogit)
-GITURL = http://www.kernel.org/pub/software/scm/git/git-1.5.2.tar.bz2
-INITGIT = test -e git/git.c || ((curl "$(GITURL)" | tar -xj) && mv git-1.5.2 git)
-else
-INITGIT = ./submodules.sh -i
-endif
-
-
-cgit: cgit.c cgit.h VERSION $(OBJECTS)
+cgit: cgit.c $(OBJECTS)
 	$(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
 
-$(OBJECTS): cgit.h git/libgit.a
+$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
 
-git/libgit.a:
-	$(INITGIT)
-	$(MAKE) -C git
+git/xdiff/lib.a: | git
 
-#
-# phony targets
-#
-install: all clean-cache
-	mkdir -p $(prefix)
-	install cgit $(prefix)/$(CGIT_SCRIPT_NAME)
-	install cgit.css $(prefix)/cgit.css
+git/libgit.a: | git
 
-clean-cgit:
-	rm -f cgit VERSION *.o
+git:
+	cd git && $(MAKE) xdiff/lib.a
+	cd git && $(MAKE) libgit.a
 
-distclean-cgit: clean-cgit
-	git clean -d -x
-
-clean-sub:
-	$(MAKE) -C git clean
-
-distclean-sub: clean-sub
-	$(shell cd git && git clean -d -x)
-
-clean-cache:
+install: all
+	mkdir -p $(CGIT_SCRIPT_PATH)
+	install cgit $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+	install cgit.css $(CGIT_SCRIPT_PATH)/cgit.css
 	rm -rf $(CACHE_ROOT)/*
 
-clean: clean-cgit clean-sub
+uninstall:
+	rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+	rm -f $(CGIT_SCRIPT_PATH)/cgit.css
+	rm -rf $(CACHE_ROOT)
 
-distclean: distclean-cgit distclean-sub
-
-version: clean-cgit
-	./gen-version.sh
-	make
+clean:
+	rm -f cgit VERSION *.o
+	cd git && $(MAKE) clean
 
-.PHONY: all install clean clean-cgit clean-sub clean-cache \
-	distclean distclean-cgit distclean-sub release version
+distclean: clean
+	git clean -d -x
+	cd git && git clean -d -x
diff --git a/gen-version.sh b/gen-version.shindex 4c60f60..739c83e 100755--- a/gen-version.sh+++ b/gen-version.sh@@ -1,4 +1,20 @@-v=$(git-describe --abbrev=4 HEAD | sed -e 's/-/./g')-test -z "$v" && exit 1-echo "CGIT_VERSION = $v"-echo "CGIT_VERSION = $v" > VERSION+#!/bin/sh++# Get version-info specified in Makefile+V=$1++# Use `git describe` to get current version if we're inside a git repo+if test -d .git+then+	V=$(git describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g')+fi++new="CGIT_VERSION = $V"+old=$(cat VERSION 2>/dev/null)++# Exit if VERSION is uptodate+test "$old" = "$new" && exit 0++# Update VERSION with new version-info+echo "$new" > VERSION+cat VERSION
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 @@
-v=$(git-describe --abbrev=4 HEAD | sed -e 's/-/./g')
-test -z "$v" && exit 1
-echo "CGIT_VERSION = $v"
-echo "CGIT_VERSION = $v" > VERSION
+#!/bin/sh
+
+# Get version-info specified in Makefile
+V=$1
+
+# Use `git describe` to get current version if we're inside a git repo
+if test -d .git
+then
+	V=$(git describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g')
+fi
+
+new="CGIT_VERSION = $V"
+old=$(cat VERSION 2>/dev/null)
+
+# Exit if VERSION is uptodate
+test "$old" = "$new" && exit 0
+
+# Update VERSION with new version-info
+echo "$new" > VERSION
+cat VERSION