builder_LIBVALA = --pkg libvala-0.28
endif
+if HAVE_LIBVALA30
+builder_LIBVALA = --pkg libvala-0.30
+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
# - 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
-
-builder4_CFLAGS = $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(LIBGDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) $(VTE_CFLAGS)
-
-builder4_LIBS = $(BUILDER_LIBS);
builder4_PKGS = \
--pkg glib-2.0 \
--pkg libsoup-2.4 \
--pkg javascriptcore \
$(builder_LIBVALA) \
- $(builder_LIBGDA) \
+ $(builder_GDA) \
$(builder_WEBKKIT) \
$(builder_JAVASCRIPTCOREGTK) \
$(builder_VTE) \
builder4_SOURCES = \
Application.vala \
Main.vala \
+ Spawn.vala \
JsRender/Gtk.vala \
+ JsRender/PlainFile.vala \
JsRender/JsRender.vala \
JsRender/Lang.vala \
JsRender/NodeToGlade.vala \
Project/Project.vala \
Project/Roo.vala \
Palete/Gir.vala \
+ Palete/GirObject.vala \
+ Palete/VapiParser.vala \
Palete/Gtk.vala \
Palete/RooDatabase.vala \
c/jscore_object_call_as_function.c \
Palete/Palete.vala \
Palete/Roo.vala \
Palete/ValaSource.vala \
+ Palete/ValaSourceCompiler.vala \
+ Palete/CompletionProvider.vala \
Builder4/About.vala \
Builder4/DialogConfirm.vala \
- Builder4/DialogNewComponent.vala \
Builder4/StandardErrorDialog.vala \
Builder4/DialogSaveTemplate.vala \
Builder4/DialogSaveModule.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 \
Resources.vala
builder4_VALAFLAGS = \
- --thread --target-glib=2.32 --vapidir=$(srcdir)/vapi -g $(builder4_PKGS)
-
-builder4_LDADD = $(BUILDER_LIBS) $(LIBVALA_LIBS) $(LIBGDA_LIBS) $(WEBKIT_LIBS) $(WEBKIT_VTE) $(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