Move cgit_version from shared.c to cgit.c

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index a93a843121e0af2b91079a0a47772b3e38109026..c9be8fa0abc0a0b25b5328e1e12f1f03d7a45bcb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-CGIT_VERSION = v0.6.2
+CGIT_VERSION = v0.7.2
 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>
-GIT_VER = 1.5.3.1
+GIT_VER = 1.5.4.1
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
@@ -13,13 +13,40 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 -include cgit.conf
 
 
-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
+#
+# Define a pattern rule for automatic dependency building
+#
+%.d: %.c
+       $(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
 
 
-.PHONY: all git install clean distclean force-version get-git
+EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
+OBJECTS =
+OBJECTS += cache.o
+OBJECTS += cgit.o
+OBJECTS += cmd.o
+OBJECTS += html.o
+OBJECTS += parsing.o
+OBJECTS += shared.o
+OBJECTS += ui-blob.o
+OBJECTS += ui-commit.o
+OBJECTS += ui-diff.o
+OBJECTS += ui-log.o
+OBJECTS += ui-patch.o
+OBJECTS += ui-refs.o
+OBJECTS += ui-repolist.o
+OBJECTS += ui-shared.o
+OBJECTS += ui-snapshot.o
+OBJECTS += ui-summary.o
+OBJECTS += ui-tag.o
+OBJECTS += ui-tree.o
+
+ifdef NEEDS_LIBICONV
+       EXTLIBS += -liconv
+endif
+
+
+.PHONY: all git test install clean distclean emptycache force-version get-git
 
 all: cgit git
 
@@ -36,10 +63,14 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 
-cgit: cgit.c $(OBJECTS)
-       $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
+cgit: $(OBJECTS)
+       $(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
+
+$(OBJECTS): git/xdiff/lib.a git/libgit.a
 
-$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
+cgit.o: VERSION
+
+-include $(OBJECTS:.o=.d)
 
 git/xdiff/lib.a: | git
 
@@ -49,24 +80,30 @@ git:
        cd git && $(MAKE) xdiff/lib.a
        cd git && $(MAKE) libgit.a
 
+test: all
+       $(MAKE) -C tests
+
 install: all
        mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
        install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
        install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
-       rm -rf $(DESTDIR)$(CACHE_ROOT)/*
+       install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
 
 uninstall:
        rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
        rm -f $(CGIT_SCRIPT_PATH)/cgit.css
-       rm -rf $(CACHE_ROOT)
+       rm -f $(CGIT_SCRIPT_PATH)/cgit.png
 
 clean:
-       rm -f cgit VERSION *.o
+       rm -f cgit VERSION *.o *.d
        cd git && $(MAKE) clean
 
 distclean: clean
        git clean -d -x
        cd git && git clean -d -x
 
+emptycache:
+       rm -rf $(DESTDIR)$(CACHE_ROOT)/*
+
 get-git:
        curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git