src/Makefile.am

[app.Builder.js] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 675b51d..2cc2bee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,26 +2,26 @@
  
 if HAVE_LIBVALA_0_22_X
 builder_LIBVALA = --pkg libvala-0.22
-AM_CPPFLAGS = $(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
-AM_CPPFLAGS = $(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
-AM_CPPFLAGS = $(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
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_28_X_CFLAGS)
+LIBVALA_CFLAGS =  $(LIBVALA_0_28_X_CFLAGS)
 LIBVALA_LIBS = $(LIBVALA_0_28_X_LIBS)
 endif
 
@@ -30,32 +30,29 @@ endif
 
 if HAVE_GDA5
 builder_LIBGDA = --pkg libgda-5.0
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBGDA5_CFLAGS)
-LIBGDA_LIBS = $(LIBGDA5_LIBS)
 endif
 
 if HAVE_GDA4
 builder_LIBGDA = --pkg libgda-4.0
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBGDA4_CFLAGS)
-LIBGDA_LIBS = $(LIBGDA4_LIBS)
 endif
 
 
-# gda
+# webkit
 
 
 if HAVE_WEBKIT4
 builder_WEBKKIT =   --pkg  webkit2gtk-4.0  
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT4_CFLAGS)
-WEBKKIT_LIBS = $(WEBKIT4_LIBS)
 endif
 
 if HAVE_WEBKIT3
 builder_WEBKKIT =   --pkg  webkit2gtk-3.0  
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT3_CFLAGS)
-WEBKKIT_LIBS = $(WEBKIT3_LIBS)
 endif
 
+ 
+
+
+AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(LIBGDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS)
+
 bin_PROGRAMS = builder
 
 builder_PKGS = \
@@ -74,6 +71,7 @@ builder_PKGS = \
                $(builder_LIBVALA) \
                $(builder_LIBGDA) \
                $(builder_WEBKKIT) \
+               $(builder_JAVASCRIPTCOREGTK) \
                --pkg vte-2.90 \
                --pkg posix 
 
@@ -131,7 +129,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)