X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=src%2FMakefile.am;h=c4db7e79528c18c886217ede08c6bbc98e3018ad;hp=da980cf38ecb54f0297219e9e5ec7802a9965fad;hb=2be38cbde3575328bd962c6dc528472aa792e246;hpb=fbb86c290415346e5b0877688ccaed1d5d4bf2c4

diff --git a/src/Makefile.am b/src/Makefile.am
index da980cf38..c4db7e795 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
 
 
@@ -70,6 +77,7 @@ builder4_PKGS = \
 		--pkg gladeui-2.0 \
 		--pkg libsoup-2.4 \
  		--pkg javascriptcore \
+		--pkg roojspacker-1.0 \
 		$(builder_LIBVALA) \
 		$(builder_GDA) \
 		$(builder_WEBKKIT) \
@@ -78,11 +86,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 +96,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 +110,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,7 +144,21 @@ 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) 
+
+		
+		
 		
 		
  
@@ -139,6 +167,6 @@ builder4_VALAFLAGS = \
 
 builder4_LDADD =  $(BUILDER_LIBS) $(LIBVALA_LIBS) $(GDA_LIBS) $(WEBKIT_LIBS) $(VTE_LIBS) $(JAVASCRIPTCOREGTK_LIBS)
 
-
+ 
 
 CLEANFILES = *.h *.c *.vapi *.stamp