Makefile: another take on git dependency rules

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index a1f961b3a88a13e7727117864a167e9fb4bcd05c..e1436a3ed3b2cc985d24cd944690113a161c2adf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ ifdef NEEDS_LIBICONV
 endif
 
 
 endif
 
 

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

 
 all: cgit
 
 
 all: cgit
 


@@ -90,20 +90,18 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 

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

        $(QUIET_CC)$(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
 
 -include $(OBJECTS:.o=.d)
 
 cgit.o: VERSION
 
 -include $(OBJECTS:.o=.d)
 

-git/xdiff/lib.a, git/libgit.a: git
+git/libgit.a: git
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a

 
 

-git:
+git/xdiff/lib.a: git

        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a

-       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a

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


@@ -122,12 +120,5 @@ uninstall:
 clean:
        rm -f cgit VERSION *.o *.d
 
 clean:
        rm -f cgit VERSION *.o *.d
 

-distclean: clean
-       git clean -d -x
-       cd git && git clean -d -x
-
-emptycache:
-       rm -rf $(DESTDIR)$(CACHE_ROOT)/*
-

 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