summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-07-22 17:30:06 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-07-22 17:42:06 (UTC)
commitbb7485e8d7932ba04a94714bfe6a86a1e323435c (patch) (unidiff)
tree1add8c867ba8ecd54314e131859d985de5f790fe
parentf49ea2c9968a8b30c0c268ca52aa066960fd98f7 (diff)
downloadcgit-bb7485e8d7932ba04a94714bfe6a86a1e323435c.zip
cgit-bb7485e8d7932ba04a94714bfe6a86a1e323435c.tar.gz
cgit-bb7485e8d7932ba04a94714bfe6a86a1e323435c.tar.bz2
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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 3719e96..e807d1e 100644
--- a/Makefile
+++ b/Makefile
@@ -66,51 +66,49 @@ OBJECTS += ui-shared.o
66OBJECTS += ui-snapshot.o 66OBJECTS += ui-snapshot.o
67OBJECTS += ui-summary.o 67OBJECTS += ui-summary.o
68OBJECTS += ui-tag.o 68OBJECTS += ui-tag.o
69OBJECTS += ui-tree.o 69OBJECTS += ui-tree.o
70 70
71ifdef NEEDS_LIBICONV 71ifdef NEEDS_LIBICONV
72 EXTLIBS += -liconv 72 EXTLIBS += -liconv
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 clean distclean emptycache force-version get-git
77 77
78all: cgit git 78all: cgit
79 79
80VERSION: force-version 80VERSION: force-version
81 @./gen-version.sh "$(CGIT_VERSION)" 81 @./gen-version.sh "$(CGIT_VERSION)"
82-include VERSION 82-include VERSION
83 83
84 84
85CFLAGS += -g -Wall -Igit 85CFLAGS += -g -Wall -Igit
86CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' 86CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
87CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' 87CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
88CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' 88CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
89CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' 89CFLAGS += -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)
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 96$(OBJECTS): | git/xdiff/lib.a git/libgit.a
97 97
98cgit.o: VERSION 98cgit.o: VERSION
99 99
100-include $(OBJECTS:.o=.d) 100-include $(OBJECTS:.o=.d)
101 101
102git/xdiff/lib.a: | git 102git/xdiff/lib.a, git/libgit.a: git
103
104git/libgit.a: | git
105 103
106git: 104git:
107 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a 105 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
108 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a 106 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
109 107
110test: all 108test: all
111 $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all 109 $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
112 110
113install: all 111install: all
114 mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) 112 mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
115 install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 113 install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
116 install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css 114 install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css