Merge branch 'master' of http://git.roojs.com/app.Builder.js

diff --git a/src/Makefile.am b/src/Makefile.am
index f0a20bf..66ea762 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,49 @@
 
  
+if HAVE_LIBVALA_0_22_X
+builder_LIBVALA = --pkg libvala-0.22
+AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_22_X_CFLAGS)
+LIBVALA_LIBS = $(LIBVALA_0_22_X_LIBS)
+endif
+ 
+if HAVE_LIBVALA_0_24_X
+builder_LIBVALA = --pkg libvala-0.24
+AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_24_X_CFLAGS)
+LIBVALA_LIBS = $(LIBVALA_0_24_X_LIBS)
+endif
 
-bin_PROGRAMS = builder
 
+if HAVE_LIBVALA_0_26_X
+builder_LIBVALA = --pkg libvala-0.26
+AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_26_X_CFLAGS)
+LIBVALA_LIBS = $(LIBVALA_0_26_X_LIBS)
+endif
+
+if HAVE_LIBVALA_0_28_X
+builder_LIBVALA = --pkg libvala-0.28
+AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_28_X_CFLAGS)
+LIBVALA_LIBS = $(LIBVALA_0_28_X_LIBS)
+endif
+
+bin_PROGRAMS = builder
 
+builder_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 webkit2gtk-3.0 \
+               --pkg clutter-gtk-1.0 \
+               --pkg gladeui-2.0 \
+               --pkg libsoup-2.4 \
+               --pkg javascriptcore \
+               $(builder_LIBVALA) \
+               --pkg vte-2.90 \
+               --pkg posix
 
 
 builder_SOURCES = \
@@ -26,6 +66,7 @@ builder_SOURCES = \
                Palete/Roo.vala \
                Palete/ValaSource.vala \
                Builder4/Application.vala \
+               Builder4/Main.vala \
                Builder4/About.vala \
                Builder4/DialogConfirm.vala \
                Builder4/DialogNewComponent.vala \
@@ -45,10 +86,15 @@ builder_SOURCES = \
                Builder4/WindowAddProp.vala \
                Builder4/GtkView.vala \
                Builder4/ValaProjectSettings.vala \
-               Builder4/MainWindow.vala
+               Builder4/MainWindow.vala 
+
+
+
+builder_VALAFLAGS = \
+       --vapidir=$(srcdir)/vapi -g  $(builder_PKGS)
 
+builder_LDADD =  $(BUILDER_LIBS) $(LIBVALA_LIBS) 
 
 
 
-VALAFLAGS = \
-       -g --pkg posix $(patsubst %,--pkg %, $(BUILDER_PACKAGES))
+CLEANFILES = *.h *.c *.vapi *.stamp