sync

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 526a935..23446b7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,11 +21,11 @@ endif
 
 
 if HAVE_GDA5
-builder_LIBGDA = --pkg libgda-5.0
+builder_GDA = --pkg libgda-5.0
 endif
 
 if HAVE_GDA4
-builder_LIBGDA = --pkg libgda-4.0
+builder_GDA = --pkg libgda-4.0
 endif
 
 
@@ -40,14 +40,24 @@ 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
+ 
+# - not sure if needed....  
 
+AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(GDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) $(VTE_CFLAGS)
 
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(LIBGDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS)
 
-bin_PROGRAMS = builder
+bin_PROGRAMS = builder4
 
-builder_PKGS = \
+ 
+builder4_PKGS = \
                --pkg glib-2.0  \
                --pkg gobject-2.0  \
                --pkg  gtk+-3.0 \
@@ -61,16 +71,17 @@ builder_PKGS = \
                --pkg libsoup-2.4 \
                --pkg javascriptcore \
                $(builder_LIBVALA) \
-               $(builder_LIBGDA) \
+               $(builder_GDA) \
                $(builder_WEBKKIT) \
                $(builder_JAVASCRIPTCOREGTK) \
-               --pkg vte-2.90 \
+               $(builder_VTE) \
                --pkg posix 
 
 
-builder_SOURCES = \
+builder4_SOURCES = \
                Application.vala \
                Main.vala \
+               Spawn.vala \
                JsRender/Gtk.vala \
                JsRender/JsRender.vala \
                JsRender/Lang.vala \
@@ -84,6 +95,8 @@ builder_SOURCES = \
                Project/Project.vala \
                Project/Roo.vala \
                Palete/Gir.vala \
+               Palete/GirObject.vala \
+               Palete/VapiParser.vala \
                Palete/Gtk.vala \
                Palete/RooDatabase.vala \
                c/jscore_object_call_as_function.c \
@@ -93,7 +106,6 @@ builder_SOURCES = \
                Palete/ValaSource.vala \
                Builder4/About.vala \
                Builder4/DialogConfirm.vala \
-               Builder4/DialogNewComponent.vala \
                Builder4/StandardErrorDialog.vala \
                Builder4/DialogSaveTemplate.vala \
                Builder4/DialogSaveModule.vala \
@@ -114,14 +126,17 @@ builder_SOURCES = \
                Builder4/WindowState.vala \
                Builder4/FakeServer.vala \
                Builder4/DialogPluginWebkit.vala \
+               Builder4/DialogNewComponent.vala \
+               Builder4/PopoverFileDetails.vala \
+               Builder4/ValaCompileErrors.vala \
                Resources.vala 
                
                
  
-builder_VALAFLAGS = \
-        --thread  --target-glib=2.32 --vapidir=$(srcdir)/vapi -g  $(builder_PKGS)
+builder4_VALAFLAGS = \
+        --thread  --target-glib=2.32 --vapidir=$(srcdir)/vapi -g  $(builder4_PKGS)
 
-builder_LDADD =  $(BUILDER_LIBS) $(LIBVALA_LIBS) $(LIBGDA_LIBS) $(WEBKIT_LIBS) $(JAVASCRIPTCOREGTK_LIBS)
+builder4_LDADD =  $(BUILDER_LIBS) $(LIBVALA_LIBS) $(GDA_LIBS) $(WEBKIT_LIBS) $(VTE_LIBS) $(JAVASCRIPTCOREGTK_LIBS)