X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/e6c960c7c0f0d2e54b51cc43ef190df3ce52755e..bafab423f20bc1448b293842c235965e1681f07e:/Makefile diff --git a/Makefile b/Makefile index 3e5a38d..1127961 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,27 @@ -CGIT_VERSION = v0.8.3.3 +all:: + +CGIT_VERSION = v0.9.1 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 +prefix = /usr +libdir = $(prefix)/lib +filterdir = $(libdir)/cgit/filters +docdir = $(prefix)/share/doc/cgit +htmldir = $(docdir) +pdfdir = $(docdir) +mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 1.7.0 -GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 +GIT_VER = 1.7.12.4 +GIT_URL = https://git-core.googlecode.com/files/git-$(GIT_VER).tar.gz INSTALL = install +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_STRCASESTR if you don't have strcasestr. # @@ -16,6 +30,11 @@ INSTALL = install # # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). # +# 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 @@ -23,15 +42,14 @@ INSTALL = install # Platform specific tweaks # +VERSION: force-version + @./gen-version.sh "$(CGIT_VERSION)" +-include VERSION + uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') -ifeq ($(uname_O),Cygwin) - NO_STRCASESTR = YesPlease - NEEDS_LIBICONV = YesPlease -endif - # # Let the user override the above settings. # @@ -52,29 +70,62 @@ endif ifndef V QUIET_CC = @echo ' ' CC $@; - QUIET_MM = @echo ' ' MM $@; + QUIET_LINK = @echo ' ' LINK $@; QUIET_SUBDIR0 = +@subdir= QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ $(MAKE) $(PRINT_DIR) -C $$subdir + QUIET_TAGS = @echo ' ' TAGS $@; + export V endif -# -# Define a pattern rule for automatic dependency building -# -%.d: %.c - $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ +LDFLAGS ?= +CFLAGS ?= -g -Wall +CFLAGS += -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)"' -# -# Define a pattern rule for silent object building -# -%.o: %.c - $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< +ifeq ($(uname_O),Cygwin) + NO_STRCASESTR = YesPlease + NEEDS_LIBICONV = YesPlease +endif +ifeq ($(uname_S),$(filter $(uname_S),FreeBSD OpenBSD)) + # Apparantly libiconv is installed in /usr/local on BSD + LDFLAGS += -L/usr/local/lib + CFLAGS += -I/usr/local/include + NEEDS_LIBICONV = yes +endif -EXTLIBS = git/libgit.a git/xdiff/lib.a -lz +GIT_OPTIONS = prefix=/usr NO_GETTEXT=1 OBJECTS = -OBJECTS += cache.o + +ifdef NO_ICONV + CFLAGS += -DNO_ICONV +endif +ifdef NO_STRCASESTR + CFLAGS += -DNO_STRCASESTR +endif +ifdef NO_C99_FORMAT + CFLAGS += -DNO_C99_FORMAT +endif +ifdef NO_OPENSSL + CFLAGS += -DNO_OPENSSL + GIT_OPTIONS += NO_OPENSSL=1 +else + LDLIBS += -lcrypto +endif + +ifdef NEEDS_LIBICONV + LDLIBS += -liconv +endif + +LDLIBS += git/libgit.a git/xdiff/lib.a -lz -lpthread + OBJECTS += cgit.o +OBJECTS += cache.o OBJECTS += cmd.o OBJECTS += configfile.o OBJECTS += html.o @@ -98,50 +149,32 @@ OBJECTS += ui-stats.o OBJECTS += ui-summary.o OBJECTS += ui-tag.o OBJECTS += ui-tree.o +OBJECTS += vector.o -ifdef NEEDS_LIBICONV - EXTLIBS += -liconv -endif - +dep_files := $(foreach f,$(OBJECTS),$(dir $f).deps/$(notdir $f).d) +dep_dirs := $(addsuffix .deps,$(sort $(dir $OBJECTS))) -.PHONY: all libgit test install uninstall clean force-version get-git \ - doc man-doc html-doc clean-doc +$(dep_dirs): + @mkdir -p $@ -all: cgit - -VERSION: force-version - @./gen-version.sh "$(CGIT_VERSION)" --include VERSION +missing_dep_dirs := $(filter-out $(wildcard $(dep_dirs)),$(dep_dirs)) +dep_file = $(dir $@).deps/$(notdir $@).d +dep_args = -MF $(dep_file) -MMD -MP +.SUFFIXES: -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)"' +$(OBJECTS): %.o: %.c $(missing_dep_dirs) + $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(CFLAGS) $< -ifdef NO_ICONV - CFLAGS += -DNO_ICONV -endif -ifdef NO_STRCASESTR - CFLAGS += -DNO_STRCASESTR -endif -ifdef NO_OPENSSL - CFLAGS += -DNO_OPENSSL - GIT_OPTIONS += NO_OPENSSL=1 -else - EXTLIBS += -lcrypto +dep_files_present := $(wildcard $(dep_files)) +ifneq ($(dep_files_present),) +include $(dep_files_present) endif -cgit: $(OBJECTS) libgit - $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) +all:: cgit -cgit.o: VERSION - -ifneq "$(MAKECMDGOALS)" "clean" - -include $(OBJECTS:.o=.d) -endif +cgit: VERSION $(OBJECTS) libgit + $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LDLIBS) libgit: $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a @@ -156,28 +189,79 @@ install: all $(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 0755 -d $(DESTDIR)$(filterdir) + $(INSTALL) -m 0755 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 $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) - rm -f $(CGIT_DATA_PATH)/cgit.css - rm -f $(CGIT_DATA_PATH)/cgit.png + 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 + +uninstall-doc: uninstall-man uninstall-html uninstall-pdf + +uninstall-man: + @for i in $(DOC_MAN5); do \ + rm -fv $(DESTDIR)$(mandir)/man5/$$i; \ + done -doc: man-doc html-doc pdf-doc +uninstall-html: + @for i in $(DOC_HTML); do \ + rm -fv $(DESTDIR)$(htmldir)/$$i; \ + done -man-doc: cgitrc.5.txt - a2x -f manpage cgitrc.5.txt +uninstall-pdf: + @for i in $(DOC_PDF); do \ + rm -fv $(DESTDIR)$(pdfdir)/$$i; \ + done -html-doc: cgitrc.5.txt - a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt +doc: doc-man doc-html doc-pdf +doc-man: doc-man5 +doc-man5: $(DOC_MAN5) +doc-html: $(DOC_HTML) +doc-pdf: $(DOC_PDF) -pdf-doc: cgitrc.5.txt +%.5 : %.5.txt + a2x -f manpage $< + +$(DOC_HTML): %.html : %.txt + a2x -f xhtml --stylesheet=cgit-doc.css $< + +$(DOC_PDF): %.pdf : %.txt a2x -f pdf cgitrc.5.txt clean: clean-doc - rm -f cgit VERSION *.o *.d + $(RM) cgit VERSION *.o tags + $(RM) -r .deps + +cleanall: clean + $(MAKE) -C git clean clean-doc: - rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo + $(RM) cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo 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 get-git libgit force-version +.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