From 587835a60fffa7bae948209c71ed7e29569465b3 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Tue, 28 Apr 2015 10:58:20 +0800
Subject: [PATCH] src/Makefile.am

---
 src/Makefile.am | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index d9ec10ebc..168530a48 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,26 +2,26 @@
  
 if HAVE_LIBVALA_0_22_X
 builder_LIBVALA = --pkg libvala-0.22
-LIBVALA_CFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_22_X_CFLAGS)
+LIBVALA_CFLAGS =  $(LIBVALA_0_22_X_CFLAGS)
 LIBVALA_LIBS = $(LIBVALA_0_22_X_LIBS)
 endif
  
 if HAVE_LIBVALA_0_24_X
 builder_LIBVALA = --pkg libvala-0.24
-LIBVALA_CFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_24_X_CFLAGS)
+LIBVALA_CFLAGS = $(LIBVALA_0_24_X_CFLAGS)
 LIBVALA_LIBS = $(LIBVALA_0_24_X_LIBS)
 endif
 
 
 if HAVE_LIBVALA_0_26_X
 builder_LIBVALA = --pkg libvala-0.26
-LIBVALA_CFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_26_X_CFLAGS)
+LIBVALA_CFLAGS = $(LIBVALA_0_26_X_CFLAGS)
 LIBVALA_LIBS = $(LIBVALA_0_26_X_LIBS)
 endif
 
 if HAVE_LIBVALA_0_28_X
 builder_LIBVALA = --pkg libvala-0.28
-LIBVALA_CFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_28_X_CFLAGS)
+LIBVALA_CFLAGS =  $(LIBVALA_0_28_X_CFLAGS)
 LIBVALA_LIBS = $(LIBVALA_0_28_X_LIBS)
 endif
 
@@ -41,7 +41,7 @@ LIBGDA_LIBS = $(LIBGDA4_LIBS)
 endif
 
 
-# gda
+# webkit
 
 
 if HAVE_WEBKIT4
@@ -56,7 +56,25 @@ WEBKIT_CFLAGS = $(WEBKIT3_CFLAGS)
 WEBKKIT_LIBS = $(WEBKIT3_LIBS)
 endif
 
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(LIBGDA_CFLAGS) $(LIBVALA_CFLAGS) 
+
+# AVASCRIPTCOREGTK
+
+
+if HAVE_JAVASCRIPTCOREGTK4
+builder_JAVASCRIPTCOREGTK =   --pkg  javascriptcoregtk-4.0  
+JAVASCRIPTCOREGTK_CFLAGS = $(JAVASCRIPTCOREGTK4_CFLAGS)
+JAVASCRIPTCOREGTK_LIBS = $(JAVASCRIPTCOREGTK4_LIBS)
+endif
+
+if HAVE_JAVASCRIPTCOREGTK3
+builder_JAVASCRIPTCOREGTK =   --pkg  javascriptcoregtk-3.0  
+JAVASCRIPTCOREGTK_CFLAGS = $(JAVASCRIPTCOREGTK3_CFLAGS)
+JAVASCRIPTCOREGTK_LIBS = $(JAVASCRIPTCOREGTK3_LIBS)
+endif
+
+
+
+AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(LIBGDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS)
 
 bin_PROGRAMS = builder
 
@@ -76,6 +94,7 @@ builder_PKGS = \
 		$(builder_LIBVALA) \
 		$(builder_LIBGDA) \
 		$(builder_WEBKKIT) \
+		$(builder_JAVASCRIPTCOREGTK) \
 		--pkg vte-2.90 \
 		--pkg posix 
 
@@ -133,7 +152,7 @@ builder_SOURCES = \
 builder_VALAFLAGS = \
 	 --thread  --target-glib=2.32 --vapidir=$(srcdir)/vapi -g  $(builder_PKGS)
 
-builder_LDADD =  $(BUILDER_LIBS) $(LIBVALA_LIBS) $(LIBGDA_LIBS) $(WEBKIT_LIBS)
+builder_LDADD =  $(BUILDER_LIBS) $(LIBVALA_LIBS) $(LIBGDA_LIBS) $(WEBKIT_LIBS) $(JAVASCRIPTCOREGTK_LIBS)
 
 
 
-- 
2.39.2