X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=src%2FMakefile.am;h=e55f3d78d1c1ec50cbbe6924a03f1cee5b494601;hp=168530a4843dad46eccacbb2b01bb03709601592;hb=fc49f865ff0b406b1fb2313e84cf3edb8536727b;hpb=587835a60fffa7bae948209c71ed7e29569465b3

diff --git a/src/Makefile.am b/src/Makefile.am
index 168530a48..e55f3d78d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,43 +1,38 @@
 
  
-if HAVE_LIBVALA_0_22_X
+if HAVE_LIBVALA22
 builder_LIBVALA = --pkg libvala-0.22
-LIBVALA_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
-LIBVALA_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
-LIBVALA_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
-LIBVALA_CFLAGS =  $(LIBVALA_0_28_X_CFLAGS)
-LIBVALA_LIBS = $(LIBVALA_0_28_X_LIBS)
+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_LIBGDA = --pkg libgda-5.0
-LIBGDA_CFLAGS = $(BUILDER_CFLAGS) $(LIBGDA5_CFLAGS)
-LIBGDA_LIBS = $(LIBGDA5_LIBS)
+builder_GDA = --pkg libgda-5.0
 endif
 
 if HAVE_GDA4
-builder_LIBGDA = --pkg libgda-4.0
-LIBGDA_CFLAGS  = $(BUILDER_CFLAGS) $(LIBGDA4_CFLAGS)
-LIBGDA_LIBS = $(LIBGDA4_LIBS)
+builder_GDA = --pkg libgda-4.0
 endif
 
 
@@ -46,39 +41,30 @@ endif
 
 if HAVE_WEBKIT4
 builder_WEBKKIT =   --pkg  webkit2gtk-4.0  
-WEBKIT_CFLAGS = $(WEBKIT4_CFLAGS)
-WEBKKIT_LIBS = $(WEBKIT4_LIBS)
 endif
 
 if HAVE_WEBKIT3
 builder_WEBKKIT =   --pkg  webkit2gtk-3.0  
-WEBKIT_CFLAGS = $(WEBKIT3_CFLAGS)
-WEBKKIT_LIBS = $(WEBKIT3_LIBS)
 endif
 
-
-# AVASCRIPTCOREGTK
-
-
-if HAVE_JAVASCRIPTCOREGTK4
-builder_JAVASCRIPTCOREGTK =   --pkg  javascriptcoregtk-4.0  
-JAVASCRIPTCOREGTK_CFLAGS = $(JAVASCRIPTCOREGTK4_CFLAGS)
-JAVASCRIPTCOREGTK_LIBS = $(JAVASCRIPTCOREGTK4_LIBS)
+# vte
+ 
+if HAVE_VTE_2_91
+builder_VTE =   --pkg  vte-2.91  
 endif
-
-if HAVE_JAVASCRIPTCOREGTK3
-builder_JAVASCRIPTCOREGTK =   --pkg  javascriptcoregtk-3.0  
-JAVASCRIPTCOREGTK_CFLAGS = $(JAVASCRIPTCOREGTK3_CFLAGS)
-JAVASCRIPTCOREGTK_LIBS = $(JAVASCRIPTCOREGTK3_LIBS)
+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 \
@@ -92,17 +78,16 @@ 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 = \
-		Application.vala \
-		Main.vala \
+BUIDERJSRENDER = \
 		JsRender/Gtk.vala \
+		JsRender/PlainFile.vala \
 		JsRender/JsRender.vala \
 		JsRender/Lang.vala \
 		JsRender/NodeToGlade.vala \
@@ -110,11 +95,12 @@ 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 \
@@ -122,9 +108,18 @@ builder_SOURCES = \
 		Palete/Palete.vala \
 		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/DialogNewComponent.vala \
 		Builder4/StandardErrorDialog.vala \
 		Builder4/DialogSaveTemplate.vala \
 		Builder4/DialogSaveModule.vala \
@@ -145,15 +140,32 @@ builder_SOURCES = \
 		Builder4/WindowState.vala \
 		Builder4/FakeServer.vala \
 		Builder4/DialogPluginWebkit.vala \
-		Resources.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) 
+
+		
+		
 		
 		
  
-builder_VALAFLAGS = \
-	 --thread  --target-glib=2.32 --vapidir=$(srcdir)/vapi -g  $(builder_PKGS)
-
-builder_LDADD =  $(BUILDER_LIBS) $(LIBVALA_LIBS) $(LIBGDA_LIBS) $(WEBKIT_LIBS) $(JAVASCRIPTCOREGTK_LIBS)
+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)
 
+ 
 
 CLEANFILES = *.h *.c *.vapi *.stamp