diff options
author | John Keeping | 2013-03-06 21:22:06 +0000 |
---|---|---|
committer | Jason A. Donenfeld | 2013-03-20 21:08:32 +0100 |
commit | 5f323c1ff45c10d8f8b0a673d2fe7e98272f5d78 (patch) | |
tree | 9f34b5e59ba56ec8551a7da5df731b231164069a /.gitignore | |
parent | e1e0e038fd0fee3fe10524d7466deab03e78deb5 (diff) | |
download | cgit-5f323c1ff45c10d8f8b0a673d2fe7e98272f5d78.tar.gz cgit-5f323c1ff45c10d8f8b0a673d2fe7e98272f5d78.tar.bz2 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>
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 |
2 | cgit | 2 | cgit |
3 | cgit.conf | 3 | cgit.conf |
4 | CGIT-CFLAGS | ||
4 | VERSION | 5 | VERSION |
5 | cgitrc.5 | 6 | cgitrc.5 |
6 | cgitrc.5.fo | 7 | cgitrc.5.fo |