X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=src%2FMakefile.am;h=e55f3d78d1c1ec50cbbe6924a03f1cee5b494601;hp=6e9f1b7bc873460214bd46d27f9540f075ed69a4;hb=a8b66892c7c6bf95db7c231045b08bcd36733fa2;hpb=b07f93556d47a95ced189549dd2ede22e60a5754

diff --git a/src/Makefile.am b/src/Makefile.am
index 6e9f1b7bc..e55f3d78d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,6 @@ if HAVE_LIBVALA24
 builder_LIBVALA = --pkg libvala-0.24
 endif
 
-
 if HAVE_LIBVALA26
 builder_LIBVALA = --pkg libvala-0.26
 endif
@@ -17,6 +16,14 @@ if HAVE_LIBVALA28
 builder_LIBVALA = --pkg libvala-0.28
 endif
 
+if HAVE_LIBVALA30
+builder_LIBVALA = --pkg libvala-0.30
+endif
+
+if HAVE_LIBVALA32
+builder_LIBVALA = --pkg libvala-0.32
+endif
+
 # gda
 
 
@@ -51,7 +58,7 @@ 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) $(GDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) $(VTE_CFLAGS)
 
 
 bin_PROGRAMS = builder4
@@ -78,11 +85,9 @@ builder4_PKGS = \
 		--pkg posix 
 
 
-builder4_SOURCES = \
-		Application.vala \
-		Main.vala \
-		Spawn.vala \
+BUIDERJSRENDER = \
 		JsRender/Gtk.vala \
+		JsRender/PlainFile.vala \
 		JsRender/JsRender.vala \
 		JsRender/Lang.vala \
 		JsRender/NodeToGlade.vala \
@@ -90,10 +95,9 @@ builder4_SOURCES = \
 		JsRender/NodeToJs.vala \
 		JsRender/NodeToVala.vala \
 		JsRender/Node.vala \
-		JsRender/Roo.vala \
-		Project/Gtk.vala \
-		Project/Project.vala \
-		Project/Roo.vala \
+		JsRender/Roo.vala 
+
+BUIDERPALETE = \
 		Palete/Gir.vala \
 		Palete/GirObject.vala \
 		Palete/VapiParser.vala \
@@ -105,6 +109,15 @@ builder4_SOURCES = \
 		Palete/Roo.vala \
 		Palete/ValaSource.vala \
 		Palete/ValaSourceCompiler.vala \
+		Palete/CompletionProvider.vala
+        
+BUIDERPROJECT = \
+		Project/Gtk.vala \
+		Project/Project.vala \
+		Project/Roo.vala 
+
+
+BUIDERUI = \
 		Builder4/About.vala \
 		Builder4/DialogConfirm.vala \
 		Builder4/StandardErrorDialog.vala \
@@ -130,15 +143,29 @@ builder4_SOURCES = \
 		Builder4/DialogNewComponent.vala \
 		Builder4/PopoverFileDetails.vala \
 		Builder4/ValaCompileErrors.vala \
-		Resources.vala 
+		Builder4/ValaCompileResults.vala \
+		Builder4/PopoverProperty.vala
+        
+builder4_SOURCES = \
+		Application.vala \
+		Main.vala \
+		Spawn.vala \
+		Resources.vala  \
+		$(BUIDERJSRENDER) \
+		$(BUIDERPALETE) \
+		$(BUIDERPROJECT) \
+		$(BUIDERUI) 
+
+		
+		
 		
 		
  
 builder4_VALAFLAGS = \
-	 --thread  --target-glib=2.32 --vapidir=$(srcdir)/vapi -g  $(builder4_PKGS)
+	 --thread -X -lm --target-glib=2.32 --vapidir=$(srcdir)/vapi -g  $(builder4_PKGS)
 
 builder4_LDADD =  $(BUILDER_LIBS) $(LIBVALA_LIBS) $(GDA_LIBS) $(WEBKIT_LIBS) $(VTE_LIBS) $(JAVASCRIPTCOREGTK_LIBS)
 
-
+ 
 
 CLEANFILES = *.h *.c *.vapi *.stamp