Move function for configfile parsing into configfile.[ch]

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index 914db1c0b43b8f178d80727932f809c4c987f499..355186eb068df3c44a3ff6890a472ef2a58bd672 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,89 +1,136 @@
-CGIT_VERSION = 0.4
-
-prefix = /var/www/htdocs/cgit
-
-SHA1_HEADER = <openssl/sha.h>
-CACHE_ROOT = /var/cache/cgit
-CGIT_CONFIG = /etc/cgitrc
+CGIT_VERSION = v0.7.2

 CGIT_SCRIPT_NAME = cgit.cgi
 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.5.4.1
+GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2

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

-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-view.o ui-tree.o ui-commit.o ui-diff.o \
-       ui-snapshot.o ui-blob.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  =

 
 

-CFLAGS += -Wall
+ifneq ($(findstring $(MAKEFLAGS),w),w)
+PRINT_DIR = --no-print-directory
+else # "make -w"
+NO_SUBDIR = :
+endif

 
 

-ifdef DEBUG
-       CFLAGS += -g
+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
 
 endif
 

-CFLAGS += -Igit
+#
+# 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) $<
+
+
+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 += shared.o
+OBJECTS += ui-blob.o
+OBJECTS += ui-commit.o
+OBJECTS += ui-diff.o
+OBJECTS += ui-log.o
+OBJECTS += ui-patch.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 NEEDS_LIBICONV
+       EXTLIBS += -liconv
+endif
+
+
+.PHONY: all git test install clean distclean emptycache force-version get-git
+
+all: cgit git
+
+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 += -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)"'

 
 
 
 

-#
-# If make is run on a nongit platform, we need to get the git sources as a tarball.
-# But there is currently no recent enough tarball available on kernel.org, so download
-# a zipfile from hjemli.net instead
-#
-GITVER = $(shell git version 2>/dev/null || echo nogit)
-ifeq ($(GITVER),nogit)
-GITURL = http://hjemli.net/git/git/snapshot/?id=v1.5.2-rc2
-INITGIT = test -e git/git.c || (curl "$(GITURL)" > tmp.zip && unzip tmp.zip)
-else
-INITGIT = ./submodules.sh -i
-endif
-
+cgit: $(OBJECTS)
+       $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)

 
 

-#
-# basic build rules
-#
-all: cgit
+$(OBJECTS): git/xdiff/lib.a git/libgit.a

 
 

-cgit: cgit.c cgit.h $(OBJECTS)
-       $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
+cgit.o: VERSION

 
 

-$(OBJECTS): cgit.h git/libgit.a
+-include $(OBJECTS:.o=.d)

 
 

-git/libgit.a:
-       $(INITGIT)
-       $(MAKE) -C git
+git/xdiff/lib.a: | git

 
 

-#
-# phony targets
-#
-install: all clean-cache
-       mkdir -p $(prefix)
-       install cgit $(prefix)/$(CGIT_SCRIPT_NAME)
-       install cgit.css $(prefix)/cgit.css
+git/libgit.a: | git

 
 

-clean-cgit:
-       rm -f cgit *.o
+git:
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a

 
 

-distclean-cgit: clean-cgit
-       git clean -d -x
+test: all
+       $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all

 
 

-clean-sub:
-       $(MAKE) -C git clean
+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

 
 

-distclean-sub: clean-sub
-       $(shell cd git && git clean -d -x)
+uninstall:
+       rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+       rm -f $(CGIT_SCRIPT_PATH)/cgit.css
+       rm -f $(CGIT_SCRIPT_PATH)/cgit.png

 
 

-clean-cache:
-       rm -rf $(CACHE_ROOT)/*
+clean:
+       rm -f cgit VERSION *.o *.d
+       cd git && $(MAKE) clean

 
 

-clean: clean-cgit clean-sub
+distclean: clean
+       git clean -d -x
+       cd git && git clean -d -x

 
 

-distclean: distclean-cgit distclean-sub
+emptycache:
+       rm -rf $(DESTDIR)$(CACHE_ROOT)/*

 
 

-.PHONY: all install clean clean-cgit clean-sub clean-cache \
-       distclean distclean-cgit distclean-sub
+get-git:
+       curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git