|
diff --git a/Makefile b/Makefile index 3719e96..e807d1e 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -66,51 +66,49 @@ 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 |
|