CGIT 0.8.3.3

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index a1caaf4244dfa54568172290aad4d20107e3d518..51620208512ec618de7ba3e17890f3844c70cae4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,33 @@
-CGIT_VERSION = v0.7.2
+CGIT_VERSION = v0.8.3.3

 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
 SHA1_HEADER = <openssl/sha.h>
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>

-GIT_VER = 1.6.0.1
+GIT_VER = 1.6.4.3

 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2

+INSTALL = install
+
+# Define NO_STRCASESTR if you don't have strcasestr.
+#
+# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
+#
+
+#-include config.mak
+
+#
+# Platform specific tweaks
+#
+
+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.
 
 #
 # Let the user override the above settings.


@@ -54,6 +76,7 @@ OBJECTS += cmd.o
 OBJECTS += configfile.o
 OBJECTS += html.o
 OBJECTS += parsing.o
 OBJECTS += configfile.o
 OBJECTS += html.o
 OBJECTS += parsing.o

+OBJECTS += scan-tree.o

 OBJECTS += shared.o
 OBJECTS += ui-atom.o
 OBJECTS += ui-blob.o
 OBJECTS += shared.o
 OBJECTS += ui-atom.o
 OBJECTS += ui-blob.o


@@ -67,6 +90,7 @@ OBJECTS += ui-refs.o
 OBJECTS += ui-repolist.o
 OBJECTS += ui-shared.o
 OBJECTS += ui-snapshot.o
 OBJECTS += ui-repolist.o
 OBJECTS += ui-shared.o
 OBJECTS += ui-snapshot.o

+OBJECTS += ui-stats.o

 OBJECTS += ui-summary.o
 OBJECTS += ui-tag.o
 OBJECTS += ui-tree.o
 OBJECTS += ui-summary.o
 OBJECTS += ui-tag.o
 OBJECTS += ui-tree.o


@@ -76,7 +100,8 @@ ifdef NEEDS_LIBICONV
 endif
 
 
 endif
 
 

-.PHONY: all libgit test install uninstall clean force-version get-git
+.PHONY: all libgit test install uninstall clean force-version get-git \
+       doc man-doc html-doc clean-doc

 
 all: cgit
 
 
 all: cgit
 


@@ -92,34 +117,55 @@ CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 

+ifdef NO_ICONV
+       CFLAGS += -DNO_ICONV
+endif
+ifdef NO_STRCASESTR
+       CFLAGS += -DNO_STRCASESTR
+endif

 
 cgit: $(OBJECTS) libgit
 
 cgit: $(OBJECTS) libgit

-       $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
+       $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)

 
 cgit.o: VERSION
 
 -include $(OBJECTS:.o=.d)
 
 libgit:
 
 cgit.o: VERSION
 
 -include $(OBJECTS:.o=.d)
 
 libgit:

-       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
-       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a

 
 test: all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 install: all
 
 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
-       install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
+       $(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

 
 uninstall:
        rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
 
 uninstall:
        rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)

-       rm -f $(CGIT_SCRIPT_PATH)/cgit.css
-       rm -f $(CGIT_SCRIPT_PATH)/cgit.png
+       rm -f $(CGIT_DATA_PATH)/cgit.css
+       rm -f $(CGIT_DATA_PATH)/cgit.png
+
+doc: man-doc html-doc pdf-doc

 
 

-clean:
+man-doc: cgitrc.5.txt
+       a2x -f manpage cgitrc.5.txt
+
+html-doc: cgitrc.5.txt
+       a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt
+
+pdf-doc: cgitrc.5.txt
+       a2x -f pdf cgitrc.5.txt
+
+clean: clean-doc

        rm -f cgit VERSION *.o *.d
 
        rm -f cgit VERSION *.o *.d
 

+clean-doc:
+       rm -f 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
 get-git:
        curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git