author | Lars Hjemli <hjemli@gmail.com> | 2008-07-31 23:25:51 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-08-01 00:04:41 (UTC) |
commit | a1266edfe6ec1fd678c8f6b60ffbd21d88ff5a93 (patch) (unidiff) | |
tree | da90c4ae217fd171a28b4ce85dd38cc2db09c7ea | |
parent | 952f4ece296d91b8b41f56de9e1c3bc80f94f196 (diff) | |
download | cgit-a1266edfe6ec1fd678c8f6b60ffbd21d88ff5a93.zip cgit-a1266edfe6ec1fd678c8f6b60ffbd21d88ff5a93.tar.gz cgit-a1266edfe6ec1fd678c8f6b60ffbd21d88ff5a93.tar.bz2 |
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>
-rw-r--r-- | Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -72,9 +72,9 @@ ifdef NEEDS_LIBICONV | |||
72 | EXTLIBS += -liconv | 72 | EXTLIBS += -liconv |
73 | endif | 73 | endif |
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 | ||
78 | all: cgit | 78 | all: cgit |
79 | 79 | ||
80 | VERSION: force-version | 80 | VERSION: force-version |
@@ -89,22 +89,20 @@ CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | |||
89 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 89 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
90 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 90 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
91 | 91 | ||
92 | 92 | ||
93 | cgit: $(OBJECTS) | 93 | cgit: $(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 | |||
98 | cgit.o: VERSION | 96 | cgit.o: VERSION |
99 | 97 | ||
100 | -include $(OBJECTS:.o=.d) | 98 | -include $(OBJECTS:.o=.d) |
101 | 99 | ||
102 | git/xdiff/lib.a, git/libgit.a: git | 100 | git/libgit.a: git |
101 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a | ||
103 | 102 | ||
104 | git: | 103 | git/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 | ||
108 | test: all | 106 | test: all |
109 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all | 107 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
110 | 108 | ||