From: Alan Knowles Date: Mon, 20 Apr 2015 08:28:44 +0000 (+0800) Subject: src/Makefile.am X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=commitdiff_plain;h=5b8c1ddc8d6fb7eb7b465935eda28fa5e7634773 src/Makefile.am --- diff --git a/src/Makefile.am b/src/Makefile.am index cdf53354e..75c5683c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,6 +25,22 @@ AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_28_X_CFLAGS) LIBVALA_LIBS = $(LIBVALA_0_28_X_LIBS) endif +# gda + + +if HAVE_GDA5 +builder_LIBGDA = --pkg libgda-5.0 +AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBGDA5_CFLAGS) +LIBGDA_LIBS = $(LIBGDA5_LIBS) +endif + +if HAVE_GDA4 +builder_LIBGDA = --pkg libgda-4.0 +AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBGDA4_CFLAGS) +LIBGDA_LIBS = $(LIBGDA4_LIBS) +endif + + bin_PROGRAMS = builder builder_PKGS = \ @@ -42,9 +58,9 @@ builder_PKGS = \ --pkg libsoup-2.4 \ --pkg javascriptcore \ $(builder_LIBVALA) \ + $(builder_LIBGDA) \ --pkg vte-2.90 \ - --pkg posix \ - --pkg libgda-5.0 + --pkg posix builder_SOURCES = \ @@ -91,9 +107,8 @@ builder_SOURCES = \ Builder4/MainWindow.vala \ Builder4/WindowState.vala \ Builder4/FakeServer.vala \ - Resources.vala - -# JsRender/RooDatabase.vala + Resources.vala \ + JsRender/RooDatabase.vala builder_VALAFLAGS = \