|
diff --git a/Makefile b/Makefile index 78aad10..a305894 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -32,64 +32,65 @@ ifndef V |
32 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
32 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
33 | $(MAKE) $(PRINT_DIR) -C $$subdir |
33 | $(MAKE) $(PRINT_DIR) -C $$subdir |
34 | endif |
34 | endif |
35 | |
35 | |
36 | # |
36 | # |
37 | # Define a pattern rule for automatic dependency building |
37 | # Define a pattern rule for automatic dependency building |
38 | # |
38 | # |
39 | %.d: %.c |
39 | %.d: %.c |
40 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
40 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
41 | |
41 | |
42 | # |
42 | # |
43 | # Define a pattern rule for silent object building |
43 | # Define a pattern rule for silent object building |
44 | # |
44 | # |
45 | %.o: %.c |
45 | %.o: %.c |
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-clone.o |
59 | OBJECTS += ui-clone.o |
60 | OBJECTS += ui-commit.o |
60 | OBJECTS += ui-commit.o |
61 | OBJECTS += ui-diff.o |
61 | OBJECTS += ui-diff.o |
62 | OBJECTS += ui-log.o |
62 | OBJECTS += ui-log.o |
63 | OBJECTS += ui-patch.o |
63 | OBJECTS += ui-patch.o |
| |
64 | OBJECTS += ui-plain.o |
64 | OBJECTS += ui-refs.o |
65 | OBJECTS += ui-refs.o |
65 | OBJECTS += ui-repolist.o |
66 | OBJECTS += ui-repolist.o |
66 | OBJECTS += ui-shared.o |
67 | OBJECTS += ui-shared.o |
67 | OBJECTS += ui-snapshot.o |
68 | OBJECTS += ui-snapshot.o |
68 | OBJECTS += ui-summary.o |
69 | OBJECTS += ui-summary.o |
69 | OBJECTS += ui-tag.o |
70 | OBJECTS += ui-tag.o |
70 | OBJECTS += ui-tree.o |
71 | OBJECTS += ui-tree.o |
71 | |
72 | |
72 | ifdef NEEDS_LIBICONV |
73 | ifdef NEEDS_LIBICONV |
73 | EXTLIBS += -liconv |
74 | EXTLIBS += -liconv |
74 | endif |
75 | endif |
75 | |
76 | |
76 | |
77 | |
77 | .PHONY: all git test install uninstall clean force-version get-git |
78 | .PHONY: all git test install uninstall clean force-version get-git |
78 | |
79 | |
79 | all: cgit |
80 | all: cgit |
80 | |
81 | |
81 | VERSION: force-version |
82 | VERSION: force-version |
82 | @./gen-version.sh "$(CGIT_VERSION)" |
83 | @./gen-version.sh "$(CGIT_VERSION)" |
83 | -include VERSION |
84 | -include VERSION |
84 | |
85 | |
85 | |
86 | |
86 | CFLAGS += -g -Wall -Igit |
87 | CFLAGS += -g -Wall -Igit |
87 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
88 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
88 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
89 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
89 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
90 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
90 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
91 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
91 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
92 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
92 | |
93 | |
93 | |
94 | |
94 | cgit: $(OBJECTS) git/libgit.a git/xdiff/lib.a |
95 | cgit: $(OBJECTS) git/libgit.a git/xdiff/lib.a |
95 | $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
96 | $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
|