Add atom-support

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index 8e3da72f6cbc78a7d7237958f041f538ecd80fce..6458431c3b612140a51f79586f12346ded1386f4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-CGIT_VERSION = v0.6.3
+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.3
+GIT_VER = 1.5.6
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
@@ -12,16 +12,71 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 #
 -include cgit.conf
 
+#
+# Define a way to invoke make in subdirs quietly, shamelessly ripped
+# from git.git
+#
+QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
+QUIET_SUBDIR1  =
+
+ifneq ($(findstring $(MAKEFLAGS),w),w)
+PRINT_DIR = --no-print-directory
+else # "make -w"
+NO_SUBDIR = :
+endif
+
+ifndef V
+       QUIET_CC       = @echo '   ' CC $@;
+       QUIET_MM       = @echo '   ' MM $@;
+       QUIET_SUBDIR0  = +@subdir=
+       QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
+                        $(MAKE) $(PRINT_DIR) -C $$subdir
+endif
 
-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
+       $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
 
+#
+# Define a pattern rule for silent object building
+#
+%.o: %.c
+       $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
 
-.PHONY: all git install clean distclean force-version get-git
 
-all: cgit git
+EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
+OBJECTS =
+OBJECTS += cache.o
+OBJECTS += cgit.o
+OBJECTS += cmd.o
+OBJECTS += configfile.o
+OBJECTS += html.o
+OBJECTS += parsing.o
+OBJECTS += shared.o
+OBJECTS += ui-atom.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 uninstall clean force-version get-git
+
+all: cgit
 
 VERSION: force-version
        @./gen-version.sh "$(CGIT_VERSION)"
@@ -36,37 +91,35 @@ 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) git/libgit.a git/xdiff/lib.a
+       $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
 
-$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
+cgit.o: VERSION
 
-git/xdiff/lib.a: | git
+-include $(OBJECTS:.o=.d)
 
-git/libgit.a: | git
+git/libgit.a: git
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
 
-git:
-       cd git && $(MAKE) xdiff/lib.a
-       cd git && $(MAKE) libgit.a
+git/xdiff/lib.a: git
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
+
+test: all
+       $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 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
-       cd git && $(MAKE) clean
-
-distclean: clean
-       git clean -d -x
-       cd git && git clean -d -x
+       rm -f cgit VERSION *.o *.d
 
 get-git:
        curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git