aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.mk
diff options
context:
space:
mode:
authorGravatar John Keeping <john@keeping.me.uk>2013-03-07 06:22:06 (JST)
committerGravatar Jason A. Donenfeld <Jason@zx2c4.com>2013-03-21 05:08:32 (JST)
commit5f323c1ff45c10d8f8b0a673d2fe7e98272f5d78 (patch)
tree9f34b5e59ba56ec8551a7da5df731b231164069a /cgit.mk
parente1e0e038fd0fee3fe10524d7466deab03e78deb5 (diff)
downloadcgit-5f323c1ff45c10d8f8b0a673d2fe7e98272f5d78.zip
cgit-5f323c1ff45c10d8f8b0a673d2fe7e98272f5d78.tar.gz
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>
Diffstat (limited to 'cgit.mk')
-rw-r--r--cgit.mk74
1 files changed, 74 insertions, 0 deletions
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)