Merge branch 'tu/credential-makefile-updates'

Build procedure for a few credential helpers (in contrib/) have
been updated.

* tu/credential-makefile-updates:
  contrib/credential: harmonize Makefiles
This commit is contained in:
Junio C Hamano 2025-10-24 13:48:04 -07:00
commit 42737585fa
2 changed files with 28 additions and 24 deletions

View File

@ -1,28 +1,27 @@
# The default target of this Makefile is...
all::
MAIN:=git-credential-libsecret
all:: $(MAIN)
CC = gcc
RM = rm -f
CFLAGS = -g -O2 -Wall
PKG_CONFIG = pkg-config
all:: git-credential-libsecret
-include ../../../config.mak.autogen
-include ../../../config.mak
prefix ?= /usr/local
gitexecdir ?= $(prefix)/libexec/git-core
CC ?= gcc
CFLAGS ?= -g -O2 -Wall
PKG_CONFIG ?= pkg-config
RM ?= rm -f
INCS:=$(shell $(PKG_CONFIG) --cflags libsecret-1 glib-2.0)
LIBS:=$(shell $(PKG_CONFIG) --libs libsecret-1 glib-2.0)
SRCS:=$(MAIN).c
OBJS:=$(SRCS:.c=.o)
%.o: %.c
$(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -o $@ -c $<
$(MAIN): $(OBJS)
$(CC) -o $@ $(LDFLAGS) $^ $(LIBS)
git-credential-libsecret: git-credential-libsecret.o
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
clean:
@$(RM) $(MAIN) $(OBJS)
$(RM) git-credential-libsecret git-credential-libsecret.o
.PHONY: all clean

View File

@ -1,19 +1,24 @@
# The default target of this Makefile is...
all:: git-credential-osxkeychain
CC = gcc
RM = rm -f
CFLAGS = -g -O2 -Wall
-include ../../../config.mak.autogen
-include ../../../config.mak
git-credential-osxkeychain: git-credential-osxkeychain.o
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) \
-framework Security -framework CoreFoundation
prefix ?= /usr/local
gitexecdir ?= $(prefix)/libexec/git-core
git-credential-osxkeychain.o: git-credential-osxkeychain.c
$(CC) -c $(CFLAGS) $<
CC ?= gcc
CFLAGS ?= -g -O2 -Wall
RM ?= rm -f
%.o: %.c
$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
git-credential-osxkeychain: git-credential-osxkeychain.o
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) \
-framework Security -framework CoreFoundation
clean:
$(RM) git-credential-osxkeychain git-credential-osxkeychain.o
.PHONY: all clean