about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJohn Keeping2013-03-06 21:22:06 +0000
committerJason A. Donenfeld2013-03-20 21:08:32 +0100
commit5f323c1ff45c10d8f8b0a673d2fe7e98272f5d78 (patch)
tree9f34b5e59ba56ec8551a7da5df731b231164069a
parenttests: check that Git version are in sync (diff)
downloadcgit-5f323c1ff45c10d8f8b0a673d2fe7e98272f5d78.tar.gz
cgit-5f323c1ff45c10d8f8b0a673d2fe7e98272f5d78.zip
Makefile: re-use Git's Makefile where possible
Git does quite a lot of platform-specific detection in its Makefile,
which can result in it defining preprocessor variables that are used in
its header files.  If CGit does not define the same variables it can
result in different sizes of some structures in different places in the
same application.

For example, on Solaris Git uses it's "compat" regex library which has a
different sized regex_t structure than that available in the platform
regex.h.  This has a knock-on effect on the size of "struct rev_info"
and leads to hard to diagnose runtime issues.

In order to avoid all of this, introduce a "cgit.mk" file that includes
Git's Makefile and make all of the existing logic apply to CGit's
objects as well.  This is slightly complicated because Git's Makefile
must run in Git's directory, so all references to CGit files need to be
prefixed with "../".

In addition, OBJECTS is a simply expanded variable in Git's Makefile so
we cannot just add our objects to it.  Instead we must copy the two
applicable rules into "cgit.mk".  This has the advantage that we can
split CGit-specific CFLAGS from Git's CFLAGS and hence avoid rebuilding
all of Git whenever a CGit-specific value changes.

Signed-off-by: John Keeping <john@keeping.me.uk>
Acked-by: Jamie Couture <jamie.couture@gmail.com>
-rw-r--r--.gitignore1
-rw-r--r--Makefile124
-rw-r--r--cgit.mk74
3 files changed, 80 insertions, 119 deletions
diff --git a/.gitignore b/.gitignore index 487728b..8011b39 100644 --- a/.gitignore +++ b/.gitignore
@@ -1,6 +1,7 @@
1# Files I don't care to see in git-status/commit 1# Files I don't care to see in git-status/commit
2cgit 2cgit
3cgit.conf 3cgit.conf
4CGIT-CFLAGS
4VERSION 5VERSION
5cgitrc.5 6cgitrc.5
6cgitrc.5.fo 7cgitrc.5.fo
diff --git a/Makefile b/Makefile index 1127961..8c00190 100644 --- a/Makefile +++ b/Makefile
@@ -23,13 +23,6 @@ DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT))
23DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT)) 23DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
24DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT)) 24DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT))
25 25
26# Define NO_STRCASESTR if you don't have strcasestr.
27#
28# Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1
29# implementation (slower).
30#
31# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
32#
33# Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.) 26# Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.)
34# do not support the 'size specifiers' introduced by C99, namely ll, hh, 27# do not support the 'size specifiers' introduced by C99, namely ll, hh,
35# j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t). 28# j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t).
@@ -39,22 +32,12 @@ DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT))
39#-include config.mak 32#-include config.mak
40 33
41# 34#
42# Platform specific tweaks
43#
44
45VERSION: force-version
46 @./gen-version.sh "$(CGIT_VERSION)"
47-include VERSION
48
49uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
50uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
51uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
52
53#
54# Let the user override the above settings. 35# Let the user override the above settings.
55# 36#
56-include cgit.conf 37-include cgit.conf
57 38
39export CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG CACHE_ROOT
40
58# 41#
59# Define a way to invoke make in subdirs quietly, shamelessly ripped 42# Define a way to invoke make in subdirs quietly, shamelessly ripped
60# from git.git 43# from git.git
@@ -69,8 +52,6 @@ NO_SUBDIR = :
69endif 52endif
70 53
71ifndef V 54ifndef V
72 QUIET_CC = @echo ' ' CC $@;
73 QUIET_LINK = @echo ' ' LINK $@;
74 QUIET_SUBDIR0 = +@subdir= 55 QUIET_SUBDIR0 = +@subdir=
75 QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ 56 QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
76 $(MAKE) $(PRINT_DIR) -C $$subdir 57 $(MAKE) $(PRINT_DIR) -C $$subdir
@@ -78,107 +59,12 @@ ifndef V
78 export V 59 export V
79endif 60endif
80 61
81LDFLAGS ?=
82CFLAGS ?= -g -Wall
83CFLAGS += -Igit
84CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
85CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
86CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
87CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
88CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
89
90ifeq ($(uname_O),Cygwin)
91 NO_STRCASESTR = YesPlease
92 NEEDS_LIBICONV = YesPlease
93endif
94
95ifeq ($(uname_S),$(filter $(uname_S),FreeBSD OpenBSD))
96 # Apparantly libiconv is installed in /usr/local on BSD
97 LDFLAGS += -L/usr/local/lib
98 CFLAGS += -I/usr/local/include
99 NEEDS_LIBICONV = yes
100endif
101
102GIT_OPTIONS = prefix=/usr NO_GETTEXT=1
103OBJECTS =
104
105ifdef NO_ICONV
106 CFLAGS += -DNO_ICONV
107endif
108ifdef NO_STRCASESTR
109 CFLAGS += -DNO_STRCASESTR
110endif
111ifdef NO_C99_FORMAT
112 CFLAGS += -DNO_C99_FORMAT
113endif
114ifdef NO_OPENSSL
115 CFLAGS += -DNO_OPENSSL
116 GIT_OPTIONS += NO_OPENSSL=1
117else
118 LDLIBS += -lcrypto
119endif
120
121ifdef NEEDS_LIBICONV
122 LDLIBS += -liconv
123endif
124
125LDLIBS += git/libgit.a git/xdiff/lib.a -lz -lpthread
126
127OBJECTS += cgit.o
128OBJECTS += cache.o
129OBJECTS += cmd.o
130OBJECTS += configfile.o
131OBJECTS += html.o
132OBJECTS += parsing.o
133OBJECTS += scan-tree.o
134OBJECTS += shared.o
135OBJECTS += ui-atom.o
136OBJECTS += ui-blob.o
137OBJECTS += ui-clone.o
138OBJECTS += ui-commit.o
139OBJECTS += ui-diff.o
140OBJECTS += ui-log.o
141OBJECTS += ui-patch.o
142OBJECTS += ui-plain.o
143OBJECTS += ui-refs.o
144OBJECTS += ui-repolist.o
145OBJECTS += ui-shared.o
146OBJECTS += ui-snapshot.o
147OBJECTS += ui-ssdiff.o
148OBJECTS += ui-stats.o
149OBJECTS += ui-summary.o
150OBJECTS += ui-tag.o
151OBJECTS += ui-tree.o
152OBJECTS += vector.o
153
154dep_files := $(foreach f,$(OBJECTS),$(dir $f).deps/$(notdir $f).d)
155dep_dirs := $(addsuffix .deps,$(sort $(dir $OBJECTS)))
156
157$(dep_dirs):
158 @mkdir -p $@
159
160missing_dep_dirs := $(filter-out $(wildcard $(dep_dirs)),$(dep_dirs))
161dep_file = $(dir $@).deps/$(notdir $@).d
162dep_args = -MF $(dep_file) -MMD -MP
163
164.SUFFIXES: 62.SUFFIXES:
165 63
166$(OBJECTS): %.o: %.c $(missing_dep_dirs)
167 $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(CFLAGS) $<
168
169dep_files_present := $(wildcard $(dep_files))
170ifneq ($(dep_files_present),)
171include $(dep_files_present)
172endif
173
174all:: cgit 64all:: cgit
175 65
176cgit: VERSION $(OBJECTS) libgit 66cgit:
177 $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LDLIBS) 67 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk ../cgit NO_CURL=1
178
179libgit:
180 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a
181 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a
182 68
183test: all 69test: all
184 $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all 70 $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
@@ -259,7 +145,7 @@ get-git:
259tags: 145tags:
260 $(QUIET_TAGS)find . -name '*.[ch]' | xargs ctags 146 $(QUIET_TAGS)find . -name '*.[ch]' | xargs ctags
261 147
262.PHONY: all cgit get-git libgit force-version 148.PHONY: all cgit get-git
263.PHONY: clean clean-doc cleanall 149.PHONY: clean clean-doc cleanall
264.PHONY: doc doc-html doc-man doc-pdf 150.PHONY: doc doc-html doc-man doc-pdf
265.PHONY: install install-doc install-html install-man install-pdf 151.PHONY: install install-doc install-html install-man install-pdf
diff --git a/cgit.mk b/cgit.mk new file mode 100644 index 0000000..4869c55 --- /dev/null +++ b/cgit.mk
@@ -0,0 +1,74 @@
1# This Makefile is run in the "git" directory in order to re-use Git's
2# build variables and operating system detection. Hence all files in
3# CGit's directory must be prefixed with "../".
4include Makefile
5
6CGIT_PREFIX = ../
7
8# The CGIT_* variables are inherited when this file is called from the
9# main Makefile - they are defined there.
10
11$(CGIT_PREFIX)VERSION: force-version
12 @cd $(CGIT_PREFIX) && ./gen-version.sh "$(CGIT_VERSION)"
13-include $(CGIT_PREFIX)VERSION
14.PHONY: force-version
15
16# CGIT_CFLAGS is a separate variable so that we can track it separately
17# and avoid rebuilding all of Git when these variables change.
18CGIT_CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
19CGIT_CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
20CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
21CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
22
23ifdef NO_C99_FORMAT
24 CFLAGS += -DNO_C99_FORMAT
25endif
26
27CGIT_OBJ_NAMES += cgit.o
28CGIT_OBJ_NAMES += cache.o
29CGIT_OBJ_NAMES += cmd.o
30CGIT_OBJ_NAMES += configfile.o
31CGIT_OBJ_NAMES += html.o
32CGIT_OBJ_NAMES += parsing.o
33CGIT_OBJ_NAMES += scan-tree.o
34CGIT_OBJ_NAMES += shared.o
35CGIT_OBJ_NAMES += ui-atom.o
36CGIT_OBJ_NAMES += ui-blob.o
37CGIT_OBJ_NAMES += ui-clone.o
38CGIT_OBJ_NAMES += ui-commit.o
39CGIT_OBJ_NAMES += ui-diff.o
40CGIT_OBJ_NAMES += ui-log.o
41CGIT_OBJ_NAMES += ui-patch.o
42CGIT_OBJ_NAMES += ui-plain.o
43CGIT_OBJ_NAMES += ui-refs.o
44CGIT_OBJ_NAMES += ui-repolist.o
45CGIT_OBJ_NAMES += ui-shared.o
46CGIT_OBJ_NAMES += ui-snapshot.o
47CGIT_OBJ_NAMES += ui-ssdiff.o
48CGIT_OBJ_NAMES += ui-stats.o
49CGIT_OBJ_NAMES += ui-summary.o
50CGIT_OBJ_NAMES += ui-tag.o
51CGIT_OBJ_NAMES += ui-tree.o
52CGIT_OBJ_NAMES += vector.o
53
54CGIT_OBJS := $(addprefix $(CGIT_PREFIX),$(CGIT_OBJ_NAMES))
55
56ifeq ($(wildcard $(CGIT_PREFIX).depend),)
57missing_dep_dirs += $(CGIT_PREFIX).depend
58endif
59
60$(CGIT_PREFIX).depend:
61 @mkdir -p $@
62
63$(CGIT_PREFIX)CGIT-CFLAGS: FORCE
64 @FLAGS='$(subst ','\'',$(CGIT_CFLAGS))'; \
65 if test x"$$FLAGS" != x"`cat ../CGIT-CFLAGS 2>/dev/null`" ; then \
66 echo 1>&2 " * new CGit build flags"; \
67 echo "$$FLAGS" >$(CGIT_PREFIX)CGIT-CFLAGS; \
68 fi
69
70$(CGIT_OBJS): %.o: %.c GIT-CFLAGS $(CGIT_PREFIX)CGIT-CFLAGS $(missing_dep_dirs)
71 $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $(CGIT_CFLAGS) $<
72
73$(CGIT_PREFIX)cgit: $(CGIT_OBJS) GIT-LDFLAGS $(GITLIBS)
74 $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)