Makefile: Git dependency, take 3

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index d83a46a0ff30d13554659ba90bb476d290a268bc..ab0bbd4d4fcea6c92069e1132c4f7a735c3cd7e7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ OBJECTS += configfile.o
 OBJECTS += html.o
 OBJECTS += parsing.o
 OBJECTS += shared.o
+OBJECTS += ui-atom.o
 OBJECTS += ui-blob.o
 OBJECTS += ui-commit.o
 OBJECTS += ui-diff.o
@@ -73,7 +74,7 @@ ifdef NEEDS_LIBICONV
 endif
 
 
-.PHONY: all git test install clean distclean emptycache force-version get-git
+.PHONY: all libgit test install uninstall clean force-version get-git
 
 all: cgit
 
@@ -90,20 +91,16 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 
-cgit: $(OBJECTS)
+cgit: $(OBJECTS) libgit
        $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
 
-$(OBJECTS): | git/xdiff/lib.a git/libgit.a
-
 cgit.o: VERSION
 
 -include $(OBJECTS:.o=.d)
 
-git/xdiff/lib.a, git/libgit.a: git
-
-git:
-       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
+libgit:
        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
 
 test: all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all