about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarco Peereboom <marco@conformal.com>2012-05-16 09:49:46 -0500
committerMarco Peereboom <marco@conformal.com>2012-05-16 16:17:38 -0500
commit6976193122770bc37aed5d423302cc3d5243b281 (patch)
treea393cd84204b8f17cab9fc1927a2f10f00a22e99
parent3a5f33776d31b646f4919019d8557713fe442a22 (diff)
downloadxombrero-6976193122770bc37aed5d423302cc3d5243b281.tar.gz
conditionally use pkg-config javascriptcoregtk-1.0
-rw-r--r--linux/Makefile9
1 files 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