Merge branch 'nb/gnome-keyring-build'

Build improvements for gnome-keyring (in contrib/)

* nb/gnome-keyring-build:
  gnome-keyring: Don't hard-code pkg-config executable
This commit is contained in:
Junio C Hamano 2016-06-27 09:56:50 -07:00
commit 880c267a24

View File

@ -4,12 +4,13 @@ all:: $(MAIN)
CC = gcc
RM = rm -f
CFLAGS = -g -O2 -Wall
PKG_CONFIG = pkg-config
-include ../../../config.mak.autogen
-include ../../../config.mak
INCS:=$(shell pkg-config --cflags gnome-keyring-1 glib-2.0)
LIBS:=$(shell pkg-config --libs gnome-keyring-1 glib-2.0)
INCS:=$(shell $(PKG_CONFIG) --cflags gnome-keyring-1 glib-2.0)
LIBS:=$(shell $(PKG_CONFIG) --libs gnome-keyring-1 glib-2.0)
SRCS:=$(MAIN).c
OBJS:=$(SRCS:.c=.o)