Makefile: fix git dependency rules
The objectfiles depends unconditionally on some specific git binaries while those git binaries depends on the phony `git` target and this patch seems to get these dependencies spelled out correctly. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Этот коммит содержится в:
родитель
f49ea2c996
Коммит
bb7485e8d7
8
Makefile
8
Makefile
@ -75,7 +75,7 @@ endif
|
|||||||
|
|
||||||
.PHONY: all git test install clean distclean emptycache force-version get-git
|
.PHONY: all git test install clean distclean emptycache force-version get-git
|
||||||
|
|
||||||
all: cgit git
|
all: cgit
|
||||||
|
|
||||||
VERSION: force-version
|
VERSION: force-version
|
||||||
@./gen-version.sh "$(CGIT_VERSION)"
|
@./gen-version.sh "$(CGIT_VERSION)"
|
||||||
@ -93,15 +93,13 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
|
|||||||
cgit: $(OBJECTS)
|
cgit: $(OBJECTS)
|
||||||
$(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
|
$(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
|
||||||
|
|
||||||
$(OBJECTS): git/xdiff/lib.a git/libgit.a
|
$(OBJECTS): | git/xdiff/lib.a git/libgit.a
|
||||||
|
|
||||||
cgit.o: VERSION
|
cgit.o: VERSION
|
||||||
|
|
||||||
-include $(OBJECTS:.o=.d)
|
-include $(OBJECTS:.o=.d)
|
||||||
|
|
||||||
git/xdiff/lib.a: | git
|
git/xdiff/lib.a, git/libgit.a: git
|
||||||
|
|
||||||
git/libgit.a: | git
|
|
||||||
|
|
||||||
git:
|
git:
|
||||||
$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
|
$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user