Move function for configfile parsing into configfile.[ch]

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index d1950cb2efec549f62463a0c2f6eaf88972d93f8..355186eb068df3c44a3ff6890a472ef2a58bd672 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,12 +12,46 @@ 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) $<
+
 
 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
@@ -57,20 +91,24 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 
 cgit: $(OBJECTS)
-       $(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
+       $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
+
+$(OBJECTS): git/xdiff/lib.a git/libgit.a
+
+cgit.o: VERSION
 
-$(OBJECTS): git/xdiff/lib.a git/libgit.a VERSION
+-include $(OBJECTS:.o=.d)
 
 git/xdiff/lib.a: | git
 
 git/libgit.a: | git
 
 git:
-       cd git && $(MAKE) xdiff/lib.a
-       cd git && $(MAKE) libgit.a
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
 
 test: all
-       $(MAKE) -C tests
+       $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 install: all
        mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
@@ -84,7 +122,7 @@ uninstall:
        rm -f $(CGIT_SCRIPT_PATH)/cgit.png
 
 clean:
-       rm -f cgit VERSION *.o
+       rm -f cgit VERSION *.o *.d
        cd git && $(MAKE) clean
 
 distclean: clean