author | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:32:48 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:32:48 (UTC) |
commit | f4f6210b4f9c214dc247567bbd06b1135c9ecd06 (patch) (unidiff) | |
tree | 432b3dc327e05220c6ac0aff9ca81cf38a47524c /Makefile | |
parent | 57bb4fdb8419d7c250d4c6146910df3263943951 (diff) | |
parent | 735e15e38a484bf0daa98776fa7cde270a271cda (diff) | |
download | cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.zip cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.tar.gz cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.tar.bz2 |
Merge branch 'ro/ssdiff'
-rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -48,96 +48,97 @@ ifneq ($(findstring $(MAKEFLAGS),w),w) | |||
48 | PRINT_DIR = --no-print-directory | 48 | PRINT_DIR = --no-print-directory |
49 | else # "make -w" | 49 | else # "make -w" |
50 | NO_SUBDIR = : | 50 | NO_SUBDIR = : |
51 | endif | 51 | endif |
52 | 52 | ||
53 | ifndef V | 53 | ifndef V |
54 | QUIET_CC = @echo ' ' CC $@; | 54 | QUIET_CC = @echo ' ' CC $@; |
55 | QUIET_MM = @echo ' ' MM $@; | 55 | QUIET_MM = @echo ' ' MM $@; |
56 | QUIET_SUBDIR0 = +@subdir= | 56 | QUIET_SUBDIR0 = +@subdir= |
57 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ | 57 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
58 | $(MAKE) $(PRINT_DIR) -C $$subdir | 58 | $(MAKE) $(PRINT_DIR) -C $$subdir |
59 | endif | 59 | endif |
60 | 60 | ||
61 | # | 61 | # |
62 | # Define a pattern rule for automatic dependency building | 62 | # Define a pattern rule for automatic dependency building |
63 | # | 63 | # |
64 | %.d: %.c | 64 | %.d: %.c |
65 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ | 65 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
66 | 66 | ||
67 | # | 67 | # |
68 | # Define a pattern rule for silent object building | 68 | # Define a pattern rule for silent object building |
69 | # | 69 | # |
70 | %.o: %.c | 70 | %.o: %.c |
71 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< | 71 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
72 | 72 | ||
73 | 73 | ||
74 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz | 74 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz |
75 | OBJECTS = | 75 | OBJECTS = |
76 | OBJECTS += cache.o | 76 | OBJECTS += cache.o |
77 | OBJECTS += cgit.o | 77 | OBJECTS += cgit.o |
78 | OBJECTS += cmd.o | 78 | OBJECTS += cmd.o |
79 | OBJECTS += configfile.o | 79 | OBJECTS += configfile.o |
80 | OBJECTS += html.o | 80 | OBJECTS += html.o |
81 | OBJECTS += parsing.o | 81 | OBJECTS += parsing.o |
82 | OBJECTS += scan-tree.o | 82 | OBJECTS += scan-tree.o |
83 | OBJECTS += shared.o | 83 | OBJECTS += shared.o |
84 | OBJECTS += ui-atom.o | 84 | OBJECTS += ui-atom.o |
85 | OBJECTS += ui-blob.o | 85 | OBJECTS += ui-blob.o |
86 | OBJECTS += ui-clone.o | 86 | OBJECTS += ui-clone.o |
87 | OBJECTS += ui-commit.o | 87 | OBJECTS += ui-commit.o |
88 | OBJECTS += ui-diff.o | 88 | OBJECTS += ui-diff.o |
89 | OBJECTS += ui-log.o | 89 | OBJECTS += ui-log.o |
90 | OBJECTS += ui-patch.o | 90 | OBJECTS += ui-patch.o |
91 | OBJECTS += ui-plain.o | 91 | OBJECTS += ui-plain.o |
92 | OBJECTS += ui-refs.o | 92 | OBJECTS += ui-refs.o |
93 | OBJECTS += ui-repolist.o | 93 | OBJECTS += ui-repolist.o |
94 | OBJECTS += ui-shared.o | 94 | OBJECTS += ui-shared.o |
95 | OBJECTS += ui-snapshot.o | 95 | OBJECTS += ui-snapshot.o |
96 | OBJECTS += ui-ssdiff.o | ||
96 | OBJECTS += ui-stats.o | 97 | OBJECTS += ui-stats.o |
97 | OBJECTS += ui-summary.o | 98 | OBJECTS += ui-summary.o |
98 | OBJECTS += ui-tag.o | 99 | OBJECTS += ui-tag.o |
99 | OBJECTS += ui-tree.o | 100 | OBJECTS += ui-tree.o |
100 | 101 | ||
101 | ifdef NEEDS_LIBICONV | 102 | ifdef NEEDS_LIBICONV |
102 | EXTLIBS += -liconv | 103 | EXTLIBS += -liconv |
103 | endif | 104 | endif |
104 | 105 | ||
105 | 106 | ||
106 | .PHONY: all libgit test install uninstall clean force-version get-git \ | 107 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
107 | doc man-doc html-doc clean-doc | 108 | doc man-doc html-doc clean-doc |
108 | 109 | ||
109 | all: cgit | 110 | all: cgit |
110 | 111 | ||
111 | VERSION: force-version | 112 | VERSION: force-version |
112 | @./gen-version.sh "$(CGIT_VERSION)" | 113 | @./gen-version.sh "$(CGIT_VERSION)" |
113 | -include VERSION | 114 | -include VERSION |
114 | 115 | ||
115 | 116 | ||
116 | CFLAGS += -g -Wall -Igit | 117 | CFLAGS += -g -Wall -Igit |
117 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 118 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
118 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 119 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
119 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 120 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
120 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 121 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
121 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 122 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
122 | 123 | ||
123 | ifdef NO_ICONV | 124 | ifdef NO_ICONV |
124 | CFLAGS += -DNO_ICONV | 125 | CFLAGS += -DNO_ICONV |
125 | endif | 126 | endif |
126 | ifdef NO_STRCASESTR | 127 | ifdef NO_STRCASESTR |
127 | CFLAGS += -DNO_STRCASESTR | 128 | CFLAGS += -DNO_STRCASESTR |
128 | endif | 129 | endif |
129 | ifdef NO_OPENSSL | 130 | ifdef NO_OPENSSL |
130 | CFLAGS += -DNO_OPENSSL | 131 | CFLAGS += -DNO_OPENSSL |
131 | GIT_OPTIONS += NO_OPENSSL=1 | 132 | GIT_OPTIONS += NO_OPENSSL=1 |
132 | else | 133 | else |
133 | EXTLIBS += -lcrypto | 134 | EXTLIBS += -lcrypto |
134 | endif | 135 | endif |
135 | 136 | ||
136 | cgit: $(OBJECTS) libgit | 137 | cgit: $(OBJECTS) libgit |
137 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 138 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
138 | 139 | ||
139 | cgit.o: VERSION | 140 | cgit.o: VERSION |
140 | 141 | ||
141 | -include $(OBJECTS:.o=.d) | 142 | -include $(OBJECTS:.o=.d) |
142 | 143 | ||
143 | libgit: | 144 | libgit: |