osxkeychain: pull make config from top-level directory

The default compiler and cflags were mostly "works for me" when I built the original version. We need to be much less careful here than usual, because we know we are building only on OS X. But it's only polite to at least respect the CFLAGS and CC definitions that the user may have provided earlier. While we're at it, let's update our definitions and rules to be more like the top-level Makefile; default our CFLAGS to include -O2, and make sure we use CFLAGS and LDFLAGS when linking. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed May 23, 2012 at 13:36 UTC 17a9ac7d6b5f27eb5f8efee324e88db2b6ec9bd6
1 file changed +5 -2
contrib/credential/osxkeychain/Makefile
+5 -2
@@ -2,10 +2,13 @@ all:: git-credential-osxkeychain
2
3 CC = gcc
4 RM = rm -f
5 -CFLAGS = -g -Wall
5 +CFLAGS = -g -O2 -Wall
6 +
7 +-include ../../../config.mak.autogen
8 +-include ../../../config.mak
9
10 git-credential-osxkeychain: git-credential-osxkeychain.o
8 - $(CC) -o $@ $< -Wl,-framework -Wl,Security
11 + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -Wl,-framework -Wl,Security
12
13 git-credential-osxkeychain.o: git-credential-osxkeychain.c
14 $(CC) -c $(CFLAGS) $<