src/Makefile.am

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 8d42466..66fe480 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,30 +1,59 @@
 
  
-if HAVE_LIBVALA_0_22_X
+if HAVE_LIBVALA22
 builder_LIBVALA = --pkg libvala-0.22
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_22_X_CFLAGS)
-LIBVALA_LIBS = $(LIBVALA_0_22_X_LIBS)
 endif
  
-if HAVE_LIBVALA_0_24_X
+if HAVE_LIBVALA24
 builder_LIBVALA = --pkg libvala-0.24
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_24_X_CFLAGS)
-LIBVALA_LIBS = $(LIBVALA_0_24_X_LIBS)
 endif
 
 
-if HAVE_LIBVALA_0_26_X
+if HAVE_LIBVALA26
 builder_LIBVALA = --pkg libvala-0.26
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_26_X_CFLAGS)
-LIBVALA_LIBS = $(LIBVALA_0_26_X_LIBS)
 endif
 
-if HAVE_LIBVALA_0_28_X
+if HAVE_LIBVALA28
 builder_LIBVALA = --pkg libvala-0.28
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_28_X_CFLAGS)
-LIBVALA_LIBS = $(LIBVALA_0_28_X_LIBS)
 endif
 
+# gda
+
+
+if HAVE_GDA5
+builder_LIBGDA = --pkg libgda-5.0
+endif
+
+if HAVE_GDA4
+builder_LIBGDA = --pkg libgda-4.0
+endif
+
+
+# webkit
+
+
+if HAVE_WEBKIT4
+builder_WEBKKIT =   --pkg  webkit2gtk-4.0  
+endif
+
+if HAVE_WEBKIT3
+builder_WEBKKIT =   --pkg  webkit2gtk-3.0  
+endif
+
+# vte
+ 
+if HAVE_VTE_2_91
+builder_VTE =   --pkg  vte-2.91  
+endif
+if HAVE_VTE_2_90
+builder_VTE =   --pkg  vte-2.90  
+endif
+ 
+ 
+
+
+AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(LIBGDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) $(VTE_CFLAGS)
+
 bin_PROGRAMS = builder
 
 builder_PKGS = \
@@ -36,15 +65,16 @@ builder_PKGS = \
                --pkg json-glib-1.0 \
                --pkg gee-1.0 \
                --pkg gobject-introspection-1.0 \
-               --pkg webkit2gtk-3.0 \
                --pkg clutter-gtk-1.0 \
                --pkg gladeui-2.0 \
                --pkg libsoup-2.4 \
                --pkg javascriptcore \
                $(builder_LIBVALA) \
-               --pkg vte-2.90 \
-               --pkg posix \
-               --pkg libgda-5.0
+               $(builder_LIBGDA) \
+               $(builder_WEBKKIT) \
+               $(builder_JAVASCRIPTCOREGTK) \
+               $(builder_VTE) \
+               --pkg posix 
 
 
 builder_SOURCES = \
@@ -64,6 +94,7 @@ builder_SOURCES = \
                Project/Roo.vala \
                Palete/Gir.vala \
                Palete/Gtk.vala \
+               Palete/RooDatabase.vala \
                c/jscore_object_call_as_function.c \
                Palete/Javascript.vala \
                Palete/Palete.vala \
@@ -91,14 +122,15 @@ builder_SOURCES = \
                Builder4/MainWindow.vala \
                Builder4/WindowState.vala \
                Builder4/FakeServer.vala \
-               Resources.vala \
-               JsRender/RooDatabase.vala 
-
-
+               Builder4/DialogPluginWebkit.vala \
+               Resources.vala 
+               
+               
+ 
 builder_VALAFLAGS = \
-       --vapidir=$(srcdir)/vapi -g  $(builder_PKGS)
+        --thread  --target-glib=2.32 --vapidir=$(srcdir)/vapi -g  $(builder_PKGS)
 
-builder_LDADD =  $(BUILDER_LIBS) $(LIBVALA_LIBS) 
+builder_LDADD =  $(BUILDER_LIBS) $(LIBVALA_LIBS) $(LIBGDA_LIBS) $(WEBKIT_LIBS) $(WEBKIT_VTE) $(JAVASCRIPTCOREGTK_LIBS)