diff options
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2010-02-19 20:07:03 +0000 |
|---|---|---|
| committer | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2010-02-28 20:10:35 +0000 |
| commit | 56931d1ab4de660b27c56ce488245e78f8c713c3 (patch) | |
| tree | ee2eb6fafc239de8d88016a1579314908b643b87 | |
| parent | 1e5dd57214dbec1b166c881c1c44c8930923da17 (diff) | |
| download | libgit2-56931d1ab4de660b27c56ce488245e78f8c713c3.tar.gz | |
Makefile: Add support for custom build options in config.mak file
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | tests/Makefile | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 5c7507cc2..0c3aa3474 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /apidocs /trash-*.exe /libgit2.pc +/config.mak *.o *.a *.exe @@ -55,6 +55,8 @@ ifneq (,$(findstring MINGW,$(uname_S))) SPARSE_FLAGS=-Wno-one-bit-signed-bitfield endif +-include config.mak + SRC_C = $(wildcard src/*.c) OS_SRC = $(wildcard src/$(OS)/*.c) SRC_C += $(OS_SRC) diff --git a/tests/Makefile b/tests/Makefile index 487addc85..beaa5abd5 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -41,6 +41,8 @@ ifneq (,$(findstring MINGW,$(uname_S))) EXTRA_LIBS += -lwsock32 -lpthread endif +-include ../config.mak + GIT_LIB = ../libgit2.a HDRS = $(wildcard ../src/*.h) |