From 6976193122770bc37aed5d423302cc3d5243b281 Mon Sep 17 00:00:00 2001 From: Marco Peereboom Date: Wed, 16 May 2012 09:49:46 -0500 Subject: conditionally use pkg-config javascriptcoregtk-1.0 --- linux/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index db13553..b6b027e 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -1,7 +1,10 @@ -LIBS= glib-2.0 gtk+-2.0 webkit-1.0 javascriptcoregtk-1.0 libsoup-2.4 gthread-2.0 gnutls libbsd +JS_CF=$(shell pkg-config --silence-errors --cflags javascriptcoregtk-1.0) +JS_LD=$(shell pkg-config --silence-errors --libs javascriptcoregtk-1.0) -CFLAGS+= -O2 -Wall -ggdb3 -D_GNU_SOURCE -I. -I.. $(shell pkg-config --cflags $(LIBS)) -LDADD+= $(shell pkg-config --libs $(LIBS)) -ldl -lgcrypt +LIBS= glib-2.0 gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0 gnutls libbsd + +CFLAGS+= -O2 -Wall -ggdb3 -D_GNU_SOURCE -I. -I.. $(shell pkg-config --cflags $(LIBS)) $(JS_CF) +LDADD+= $(shell pkg-config --libs $(LIBS)) $(JS_LD) -ldl -lgcrypt -lX11 PREFIX?= /usr/local BINDIR?= $(PREFIX)/bin -- cgit 1.4.1-2-gfad0