fix makefile

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 0575730..c4db7e7 100644 (file)
--- 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,15 +16,23 @@ 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_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
 
 
@@ -51,7 +58,7 @@ endif
  
 # - not sure if needed....  
 
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(LIBGDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) $(VTE_CFLAGS)
+AM_CPPFLAGS =  $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(GDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) $(VTE_CFLAGS)
 
 
 bin_PROGRAMS = builder4
@@ -70,18 +77,18 @@ builder4_PKGS = \
                --pkg gladeui-2.0 \
                --pkg libsoup-2.4 \
                --pkg javascriptcore \
+               --pkg roojspacker-1.0 \
                $(builder_LIBVALA) \
-               $(builder_LIBGDA) \
+               $(builder_GDA) \
                $(builder_WEBKKIT) \
                $(builder_JAVASCRIPTCOREGTK) \
                $(builder_VTE) \
                --pkg posix 
 
 
-builder4_SOURCES = \
-               Application.vala \
-               Main.vala \
+BUIDERJSRENDER = \
                JsRender/Gtk.vala \
+               JsRender/PlainFile.vala \
                JsRender/JsRender.vala \
                JsRender/Lang.vala \
                JsRender/NodeToGlade.vala \
@@ -89,11 +96,12 @@ 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 \
                Palete/Gtk.vala \
                Palete/RooDatabase.vala \
                c/jscore_object_call_as_function.c \
@@ -101,9 +109,18 @@ builder4_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 \
@@ -124,15 +141,32 @@ builder4_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) 
+
+               
+               
                
                
  
 builder4_VALAFLAGS = \
-        --thread  --target-glib=2.32 --vapidir=$(srcdir)/vapi -g  $(builder4_PKGS)
-
-builder4_LDADD =  $(BUILDER_LIBS) $(LIBVALA_LIBS) $(LIBGDA_LIBS) $(WEBKIT_LIBS) $(VTE_LIBS) $(JAVASCRIPTCOREGTK_LIBS)
+        --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