author | Lars Hjemli <hjemli@gmail.com> | 2008-07-22 17:30:06 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-07-22 17:42:06 (UTC) |
commit | bb7485e8d7932ba04a94714bfe6a86a1e323435c (patch) (unidiff) | |
tree | 1add8c867ba8ecd54314e131859d985de5f790fe | |
parent | f49ea2c9968a8b30c0c268ca52aa066960fd98f7 (diff) | |
download | cgit-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>
-rw-r--r-- | Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -46,91 +46,89 @@ endif | |||
46 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< | 46 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
47 | 47 | ||
48 | 48 | ||
49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
50 | OBJECTS = | 50 | OBJECTS = |
51 | OBJECTS += cache.o | 51 | OBJECTS += cache.o |
52 | OBJECTS += cgit.o | 52 | OBJECTS += cgit.o |
53 | OBJECTS += cmd.o | 53 | OBJECTS += cmd.o |
54 | OBJECTS += configfile.o | 54 | OBJECTS += configfile.o |
55 | OBJECTS += html.o | 55 | OBJECTS += html.o |
56 | OBJECTS += parsing.o | 56 | OBJECTS += parsing.o |
57 | OBJECTS += shared.o | 57 | OBJECTS += shared.o |
58 | OBJECTS += ui-blob.o | 58 | OBJECTS += ui-blob.o |
59 | OBJECTS += ui-commit.o | 59 | OBJECTS += ui-commit.o |
60 | OBJECTS += ui-diff.o | 60 | OBJECTS += ui-diff.o |
61 | OBJECTS += ui-log.o | 61 | OBJECTS += ui-log.o |
62 | OBJECTS += ui-patch.o | 62 | OBJECTS += ui-patch.o |
63 | OBJECTS += ui-refs.o | 63 | OBJECTS += ui-refs.o |
64 | OBJECTS += ui-repolist.o | 64 | OBJECTS += ui-repolist.o |
65 | OBJECTS += ui-shared.o | 65 | OBJECTS += ui-shared.o |
66 | OBJECTS += ui-snapshot.o | 66 | OBJECTS += ui-snapshot.o |
67 | OBJECTS += ui-summary.o | 67 | OBJECTS += ui-summary.o |
68 | OBJECTS += ui-tag.o | 68 | OBJECTS += ui-tag.o |
69 | OBJECTS += ui-tree.o | 69 | OBJECTS += ui-tree.o |
70 | 70 | ||
71 | ifdef NEEDS_LIBICONV | 71 | 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 clean distclean emptycache force-version get-git |
77 | 77 | ||
78 | all: cgit git | 78 | all: cgit |
79 | 79 | ||
80 | VERSION: force-version | 80 | VERSION: force-version |
81 | @./gen-version.sh "$(CGIT_VERSION)" | 81 | @./gen-version.sh "$(CGIT_VERSION)" |
82 | -include VERSION | 82 | -include VERSION |
83 | 83 | ||
84 | 84 | ||
85 | CFLAGS += -g -Wall -Igit | 85 | CFLAGS += -g -Wall -Igit |
86 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 86 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
87 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 87 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
88 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 88 | 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) |
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 | ||
98 | cgit.o: VERSION | 98 | cgit.o: VERSION |
99 | 99 | ||
100 | -include $(OBJECTS:.o=.d) | 100 | -include $(OBJECTS:.o=.d) |
101 | 101 | ||
102 | git/xdiff/lib.a: | git | 102 | git/xdiff/lib.a, git/libgit.a: git |
103 | |||
104 | git/libgit.a: | git | ||
105 | 103 | ||
106 | git: | 104 | git: |
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 | ||
110 | test: all | 108 | test: all |
111 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all | 109 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
112 | 110 | ||
113 | install: all | 111 | install: 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 |
117 | install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png | 115 | install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png |
118 | 116 | ||
119 | uninstall: | 117 | uninstall: |
120 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 118 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
121 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css | 119 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css |
122 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png | 120 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png |
123 | 121 | ||
124 | clean: | 122 | clean: |
125 | rm -f cgit VERSION *.o *.d | 123 | rm -f cgit VERSION *.o *.d |
126 | cd git && $(MAKE) clean | 124 | cd git && $(MAKE) clean |
127 | 125 | ||
128 | distclean: clean | 126 | distclean: clean |
129 | git clean -d -x | 127 | git clean -d -x |
130 | cd git && git clean -d -x | 128 | cd git && git clean -d -x |
131 | 129 | ||
132 | emptycache: | 130 | emptycache: |
133 | rm -rf $(DESTDIR)$(CACHE_ROOT)/* | 131 | rm -rf $(DESTDIR)$(CACHE_ROOT)/* |
134 | 132 | ||
135 | get-git: | 133 | get-git: |
136 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git | 134 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |