ui-repolist: add support for sorting any column

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index d826f97cf5174c302bace3ae16c54e3e586b4e83..21076103395d07bcbe9f0419b8b7a190238d2cee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,129 @@
-CGIT_VERSION = 0.2
+CGIT_VERSION = v0.8.1
+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.6.0.3
+GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2

 
 

-prefix = /var/www/htdocs/cgit
-gitsrc = ../git
+#
+# Let the user override the above settings.
+#
+-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
+
+#
+# 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) $<

 
 

-CACHE_ROOT = /var/cache/cgit
-EXTLIBS = $(gitsrc)/libgit.a $(gitsrc)/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-view.c ui-tree.c ui-commit.c ui-diff.o

 
 

-CFLAGS += -Wall
+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 += scan-tree.o
+OBJECTS += shared.o
+OBJECTS += ui-atom.o
+OBJECTS += ui-blob.o
+OBJECTS += ui-clone.o
+OBJECTS += ui-commit.o
+OBJECTS += ui-diff.o
+OBJECTS += ui-log.o
+OBJECTS += ui-patch.o
+OBJECTS += ui-plain.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 DEBUG
-       CFLAGS += -g
+ifdef NEEDS_LIBICONV
+       EXTLIBS += -liconv

 endif
 
 endif
 

+
+.PHONY: all libgit test install uninstall clean force-version get-git
+

 all: cgit
 
 all: cgit
 

-install: all clean-cache
-       mkdir -p $(prefix)
-       install cgit $(prefix)/cgit.cgi
-       install cgit.css $(prefix)/cgit.css
+VERSION: force-version
+       @./gen-version.sh "$(CGIT_VERSION)"
+-include VERSION
+
+
+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)"'
+
+ifdef NO_ICONV
+       CFLAGS += -DNO_ICONV
+endif
+
+cgit: $(OBJECTS) libgit
+       $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
+
+cgit.o: VERSION

 
 

-cgit: cgit.c cgit.h git.h $(OBJECTS) $(gitsrc)/libgit.a
-       $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
-               $(OBJECTS) $(EXTLIBS)
+-include $(OBJECTS:.o=.d)

 
 

-$(OBJECTS): cgit.h git.h
+libgit:
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a

 
 

-ui-diff.o: xdiff.h
+test: all
+       $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all

 
 

-$(gitsrc)/libgit.a:
-       $(MAKE) -C $(gitsrc)
+install: all
+       mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
+       install 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

 
 

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

 
 

-.PHONY: clean

 clean:
 clean:

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

 
 

-clean-cache:
-       rm -rf $(CACHE_ROOT)/*
+get-git:
+       curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git