| -rw-r--r-- | Makefile | 36 |
1 files changed, 5 insertions, 31 deletions
@@ -12,38 +12,12 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 # -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) $< + $(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto @@ -90,7 +64,7 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' cgit: $(OBJECTS) - $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) + $(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) $(OBJECTS): git/xdiff/lib.a git/libgit.a @@ -103,11 +77,11 @@ git/xdiff/lib.a: | git git/libgit.a: | git git: - $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a - $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a + cd git && $(MAKE) xdiff/lib.a + cd git && $(MAKE) libgit.a test: all - $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all + $(MAKE) -C tests install: all mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) |