From: Alan Knowles Date: Tue, 28 Apr 2015 04:36:35 +0000 (+0800) Subject: conf1574.file X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=commitdiff_plain;h=5d1435ae6d6f9a2306544fe9f37df07c966efff1 conf1574.file conf1574 conf1574.dir --- diff --git a/src/Makefile.am b/src/Makefile.am index 66fe4804f..4b8c803e5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,14 +49,17 @@ if HAVE_VTE_2_90 builder_VTE = --pkg vte-2.90 endif - - +# - not sure if needed.... AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(LIBGDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) $(VTE_CFLAGS) -bin_PROGRAMS = builder -builder_PKGS = \ +bin_PROGRAMS = builder4 + + +builder4_CFLAGS = $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(LIBGDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) $(VTE_CFLAGS) + +builder4_PKGS = \ --pkg glib-2.0 \ --pkg gobject-2.0 \ --pkg gtk+-3.0 \ @@ -77,7 +80,7 @@ builder_PKGS = \ --pkg posix -builder_SOURCES = \ +builder4_SOURCES = \ Application.vala \ Main.vala \ JsRender/Gtk.vala \ @@ -127,10 +130,10 @@ builder_SOURCES = \ -builder_VALAFLAGS = \ +builder4_VALAFLAGS = \ --thread --target-glib=2.32 --vapidir=$(srcdir)/vapi -g $(builder_PKGS) -builder_LDADD = $(BUILDER_LIBS) $(LIBVALA_LIBS) $(LIBGDA_LIBS) $(WEBKIT_LIBS) $(WEBKIT_VTE) $(JAVASCRIPTCOREGTK_LIBS) +builder4_LDADD = $(BUILDER_LIBS) $(LIBVALA_LIBS) $(LIBGDA_LIBS) $(WEBKIT_LIBS) $(WEBKIT_VTE) $(JAVASCRIPTCOREGTK_LIBS)