Merge branch 'lh/readme'

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index 9457940f70b7cea709c0f6b1da1931a48a294bac..23fdd53d2b382fb2c71f0077d9e39e8f03704789 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,19 @@
-CGIT_VERSION = v0.8.1
+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.3
+GIT_VER = 1.7.3

 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.
 #
 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 NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1
+# implementation (slower).
+#

 # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
 #
 
 # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
 #
 


@@ -67,7 +71,7 @@ endif
        $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
 
 
        $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
 
 

-EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
+EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread

 OBJECTS =
 OBJECTS += cache.o
 OBJECTS += cgit.o
 OBJECTS =
 OBJECTS += cache.o
 OBJECTS += cgit.o


@@ -89,6 +93,8 @@ 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-ssdiff.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


@@ -98,7 +104,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
 


@@ -120,17 +127,25 @@ endif
 ifdef NO_STRCASESTR
        CFLAGS += -DNO_STRCASESTR
 endif
 ifdef NO_STRCASESTR
        CFLAGS += -DNO_STRCASESTR
 endif

+ifdef NO_OPENSSL
+       CFLAGS += -DNO_OPENSSL
+       GIT_OPTIONS += NO_OPENSSL=1
+else
+       EXTLIBS += -lcrypto
+endif

 
 cgit: $(OBJECTS) libgit
        $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
 
 cgit.o: VERSION
 
 
 cgit: $(OBJECTS) libgit
        $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
 
 cgit.o: VERSION
 

--include $(OBJECTS:.o=.d)
+ifneq "$(MAKECMDGOALS)" "clean"
+  -include $(OBJECTS:.o=.d)
+endif

 
 libgit:
 
 libgit:

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

 
 test: all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 test: all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all


@@ -138,16 +153,31 @@ test: all
 install: all
        $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH)
        $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
 install: all
        $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH)
        $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)

-       $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
-       $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
+       $(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