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

diff --git a/src/Makefile.am b/src/Makefile.am
index f0a20bf1c..c4db7e795 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,94 @@
 
  
+if HAVE_LIBVALA22
+builder_LIBVALA = --pkg libvala-0.22
+endif
+ 
+if HAVE_LIBVALA24
+builder_LIBVALA = --pkg libvala-0.24
+endif
+
+if HAVE_LIBVALA26
+builder_LIBVALA = --pkg libvala-0.26
+endif
+
+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
+
+
+if HAVE_GDA5
+builder_GDA = --pkg libgda-5.0
+endif
+
+if HAVE_GDA4
+builder_GDA = --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
+ 
+# - not sure if needed....  
 
-bin_PROGRAMS = builder
+AM_CPPFLAGS =  $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(GDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) $(VTE_CFLAGS)
 
 
+bin_PROGRAMS = builder4
+
+ 
+builder4_PKGS = \
+		--pkg glib-2.0  \
+		--pkg gobject-2.0  \
+		--pkg  gtk+-3.0 \
+		--pkg  gtksourceview-3.0 \
+		--pkg  libxml-2.0 \
+		--pkg json-glib-1.0 \
+		--pkg gee-1.0 \
+		--pkg gobject-introspection-1.0 \
+		--pkg clutter-gtk-1.0 \
+		--pkg gladeui-2.0 \
+		--pkg libsoup-2.4 \
+ 		--pkg javascriptcore \
+		--pkg roojspacker-1.0 \
+		$(builder_LIBVALA) \
+		$(builder_GDA) \
+		$(builder_WEBKKIT) \
+		$(builder_JAVASCRIPTCOREGTK) \
+		$(builder_VTE) \
+		--pkg posix 
 
 
-builder_SOURCES = \
+BUIDERJSRENDER = \
 		JsRender/Gtk.vala \
+		JsRender/PlainFile.vala \
 		JsRender/JsRender.vala \
 		JsRender/Lang.vala \
 		JsRender/NodeToGlade.vala \
@@ -15,20 +96,31 @@ builder_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 \
 		Palete/Gtk.vala \
+		Palete/RooDatabase.vala \
+		c/jscore_object_call_as_function.c \
 		Palete/Javascript.vala \
 		Palete/Palete.vala \
 		Palete/Roo.vala \
 		Palete/ValaSource.vala \
-		Builder4/Application.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/DialogNewComponent.vala \
 		Builder4/StandardErrorDialog.vala \
 		Builder4/DialogSaveTemplate.vala \
 		Builder4/DialogSaveModule.vala \
@@ -45,10 +137,36 @@ builder_SOURCES = \
 		Builder4/WindowAddProp.vala \
 		Builder4/GtkView.vala \
 		Builder4/ValaProjectSettings.vala \
-		Builder4/MainWindow.vala
+		Builder4/MainWindow.vala \
+		Builder4/WindowState.vala \
+		Builder4/FakeServer.vala \
+		Builder4/DialogPluginWebkit.vala \
+		Builder4/DialogNewComponent.vala \
+		Builder4/PopoverFileDetails.vala \
+		Builder4/ValaCompileErrors.vala \
+		Builder4/ValaCompileResults.vala \
+		Builder4/PopoverProperty.vala
+        
+builder4_SOURCES = \
+		Application.vala \
+		Main.vala \
+		Spawn.vala \
+		Resources.vala  \
+		$(BUIDERJSRENDER) \
+		$(BUIDERPALETE) \
+		$(BUIDERPROJECT) \
+		$(BUIDERUI) 
 
+		
+		
+		
+		
+ 
+builder4_VALAFLAGS = \
+	 --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)
 
+ 
 
-VALAFLAGS = \
-	-g --pkg posix $(patsubst %,--pkg %, $(BUILDER_PACKAGES))
+CLEANFILES = *.h *.c *.vapi *.stamp