about summary refs log tree commit diff stats
path: root/Makefile
diff options
context:
space:
mode:
authorLars Hjemli2008-08-01 01:25:51 +0200
committerLars Hjemli2008-08-01 02:04:41 +0200
commita1266edfe6ec1fd678c8f6b60ffbd21d88ff5a93 (patch)
treeda90c4ae217fd171a28b4ce85dd38cc2db09c7ea /Makefile
parentModify default value for a few cgitrc options (diff)
downloadcgit-a1266edfe6ec1fd678c8f6b60ffbd21d88ff5a93.tar.gz
cgit-a1266edfe6ec1fd678c8f6b60ffbd21d88ff5a93.zip
Makefile: another take on git dependency rules
When building cgit we depend on xdiff/lib.a and libgit.a in the git
directory, but the previous attempt on describing this dependency
failed since the build instructions for the libs was placed under the
phony `git` target.

This patch fixes the issue by moving the build instructions to their
real targets. It also makes it clear that only the `cgit` target
depends on the git binaries (since they're only used during linking).

And while at it, the patch also cleans up the list of phony targets.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 5 insertions, 7 deletions
diff --git a/Makefile b/Makefile index d83a46a..e1436a3 100644 --- a/Makefile +++ b/Makefile
@@ -73,7 +73,7 @@ ifdef NEEDS_LIBICONV
73endif 73endif
74 74
75 75
76.PHONY: all git test install clean distclean emptycache force-version get-git 76.PHONY: all git test install uninstall clean force-version get-git
77 77
78all: cgit 78all: cgit
79 79
@@ -90,20 +90,18 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
90CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' 90CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
91 91
92 92
93cgit: $(OBJECTS) 93cgit: $(OBJECTS) git/libgit.a git/xdiff/lib.a
94 $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) 94 $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
95 95
96$(OBJECTS): | git/xdiff/lib.a git/libgit.a
97
98cgit.o: VERSION 96cgit.o: VERSION
99 97
100-include $(OBJECTS:.o=.d) 98-include $(OBJECTS:.o=.d)
101 99
102git/xdiff/lib.a, git/libgit.a: git 100git/libgit.a: git
101 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
103 102
104git: 103git/xdiff/lib.a: git
105 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a 104 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
106 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
107 105
108test: all 106test: all
109 $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all 107 $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all