parsing.c: Remove leading space from committer

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index 8bf47f22a73e7a4a7172bbb58dc96cb428485c97..9930570c04a33364f2991940de014233cb915043 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,83 +1,158 @@
-CGIT_VERSION = v0.7.2
+all::
+
+CGIT_VERSION = v0.9.2

 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit

+CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)

 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit

+prefix = /usr/local
+libdir = $(prefix)/lib
+filterdir = $(libdir)/cgit/filters
+docdir = $(prefix)/share/doc/cgit
+htmldir = $(docdir)
+pdfdir = $(docdir)
+mandir = $(prefix)/share/man

 SHA1_HEADER = <openssl/sha.h>
 SHA1_HEADER = <openssl/sha.h>

-GIT_VER = 1.5.5.rc1
-GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
+GIT_VER = 1.8.5
+GIT_URL = https://git-core.googlecode.com/files/git-$(GIT_VER).tar.gz
+INSTALL = install
+COPYTREE = cp -r
+MAN5_TXT = $(wildcard *.5.txt)
+MAN_TXT  = $(MAN5_TXT)
+DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT))
+DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
+DOC_PDF  = $(patsubst %.txt,%.pdf,$(MAN_TXT))
+
+# Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.)
+# do not support the 'size specifiers' introduced by C99, namely ll, hh,
+# j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t).
+# some C compilers supported these specifiers prior to C99 as an extension.
+#
+
+#-include config.mak

 
 #
 # Let the user override the above settings.
 #
 -include cgit.conf
 
 
 #
 # Let the user override the above settings.
 #
 -include cgit.conf
 

+export CGIT_VERSION CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG CACHE_ROOT

 
 

-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 ui-refs.o ui-patch.o
-
+#
+# 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  =

 
 

-ifdef NEEDS_LIBICONV
-       EXTLIBS += -liconv
+ifneq ($(findstring $(MAKEFLAGS),w),w)
+PRINT_DIR = --no-print-directory
+else # "make -w"
+NO_SUBDIR = :

 endif
 
 endif
 

+ifndef V
+       QUIET_SUBDIR0  = +@subdir=
+       QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
+                        $(MAKE) $(PRINT_DIR) -C $$subdir
+       QUIET_TAGS     = @echo '   ' TAGS $@;
+       export V
+endif

 
 

-.PHONY: all git test install clean distclean emptycache force-version get-git
+.SUFFIXES:

 
 

-all: cgit git
+all:: cgit

 
 

-VERSION: force-version
-       @./gen-version.sh "$(CGIT_VERSION)"
--include VERSION
+cgit:
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk ../cgit $(EXTRA_GIT_TARGETS) NO_CURL=1

 
 

+test:
+       @$(MAKE) --no-print-directory cgit EXTRA_GIT_TARGETS=all
+       $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all

 
 

-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)"'
-CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
+install: all
+       $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH)
+       $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+       $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
+       $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
+       $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
+       $(INSTALL) -m 0644 favicon.ico $(DESTDIR)$(CGIT_DATA_PATH)/favicon.ico
+       $(INSTALL) -m 0644 robots.txt $(DESTDIR)$(CGIT_DATA_PATH)/robots.txt
+       $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)
+       $(COPYTREE)  filters/* $(DESTDIR)$(filterdir)
+
+install-doc: install-man install-html install-pdf
+
+install-man: doc-man
+       $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man5
+       $(INSTALL) -m 0644 $(DOC_MAN5) $(DESTDIR)$(mandir)/man5
+
+install-html: doc-html
+       $(INSTALL) -m 0755 -d $(DESTDIR)$(htmldir)
+       $(INSTALL) -m 0644 $(DOC_HTML) $(DESTDIR)$(htmldir)
+
+install-pdf: doc-pdf
+       $(INSTALL) -m 0755 -d $(DESTDIR)$(pdfdir)
+       $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)

 
 

+uninstall:
+       rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+       rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
+       rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
+       rm -f $(DESTDIR)$(CGIT_DATA_PATH)/favicon.ico

 
 

-cgit: cgit.c $(OBJECTS)
-       $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
+uninstall-doc: uninstall-man uninstall-html uninstall-pdf

 
 

-$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
+uninstall-man:
+       @for i in $(DOC_MAN5); do \
+           rm -fv $(DESTDIR)$(mandir)/man5/$$i; \
+       done

 
 

-git/xdiff/lib.a: | git
+uninstall-html:
+       @for i in $(DOC_HTML); do \
+           rm -fv $(DESTDIR)$(htmldir)/$$i; \
+       done

 
 

-git/libgit.a: | git
+uninstall-pdf:
+       @for i in $(DOC_PDF); do \
+           rm -fv $(DESTDIR)$(pdfdir)/$$i; \
+       done

 
 

-git:
-       cd git && $(MAKE) xdiff/lib.a
-       cd git && $(MAKE) libgit.a
+doc: doc-man doc-html doc-pdf
+doc-man: doc-man5
+doc-man5: $(DOC_MAN5)
+doc-html: $(DOC_HTML)
+doc-pdf: $(DOC_PDF)

 
 

-test: all
-       $(MAKE) -C tests
+%.5 : %.5.txt
+       a2x -f manpage $<

 
 

-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
-       install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
+$(DOC_HTML): %.html : %.txt
+       a2x -f xhtml --stylesheet=cgit-doc.css $<

 
 

-uninstall:
-       rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
-       rm -f $(CGIT_SCRIPT_PATH)/cgit.css
-       rm -f $(CGIT_SCRIPT_PATH)/cgit.png
+$(DOC_PDF): %.pdf : %.txt
+       a2x -f pdf cgitrc.5.txt

 
 

-clean:
-       rm -f cgit VERSION *.o
-       cd git && $(MAKE) clean
+clean: clean-doc
+       $(RM) cgit VERSION CGIT-CFLAGS *.o tags
+       $(RM) -r .deps

 
 

-distclean: clean
-       git clean -d -x
-       cd git && git clean -d -x
+cleanall: clean
+       $(MAKE) -C git clean

 
 

-emptycache:
-       rm -rf $(DESTDIR)$(CACHE_ROOT)/*
+clean-doc:
+       $(RM) cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo

 
 get-git:
 
 get-git:

-       curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git
+       curl -L $(GIT_URL) | tar -xzf - && rm -rf git && mv git-$(GIT_VER) git
+
+tags:
+       $(QUIET_TAGS)find . -name '*.[ch]' | xargs ctags
+
+.PHONY: all cgit git get-git
+.PHONY: clean clean-doc cleanall
+.PHONY: doc doc-html doc-man doc-pdf
+.PHONY: install install-doc install-html install-man install-pdf
+.PHONY: tags test
+.PHONY: uninstall uninstall-doc uninstall-html uninstall-man uninstall-pdf