From: Alan Knowles <alan@roojs.com>
Date: Tue, 28 Apr 2015 02:48:52 +0000 (+0800)
Subject: src/Makefile.am
X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=commitdiff_plain;h=f5412b4e2f2cc2f452ca5e3af864e567eaffd81e

src/Makefile.am
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 675b51d7d..d9ec10ebc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,26 +2,26 @@
  
 if HAVE_LIBVALA_0_22_X
 builder_LIBVALA = --pkg libvala-0.22
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_22_X_CFLAGS)
+LIBVALA_CFLAGS = $(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_CFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_24_X_CFLAGS)
 LIBVALA_LIBS = $(LIBVALA_0_24_X_LIBS)
 endif
 
 
 if HAVE_LIBVALA_0_26_X
 builder_LIBVALA = --pkg libvala-0.26
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_26_X_CFLAGS)
+LIBVALA_CFLAGS = $(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_CFLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_28_X_CFLAGS)
 LIBVALA_LIBS = $(LIBVALA_0_28_X_LIBS)
 endif
 
@@ -30,13 +30,13 @@ endif
 
 if HAVE_GDA5
 builder_LIBGDA = --pkg libgda-5.0
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(LIBGDA5_CFLAGS)
+LIBGDA_CFLAGS = $(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_CFLAGS  = $(BUILDER_CFLAGS) $(LIBGDA4_CFLAGS)
 LIBGDA_LIBS = $(LIBGDA4_LIBS)
 endif
 
@@ -46,16 +46,18 @@ endif
 
 if HAVE_WEBKIT4
 builder_WEBKKIT =   --pkg  webkit2gtk-4.0  
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT4_CFLAGS)
+WEBKIT_CFLAGS = $(WEBKIT4_CFLAGS)
 WEBKKIT_LIBS = $(WEBKIT4_LIBS)
 endif
 
 if HAVE_WEBKIT3
 builder_WEBKKIT =   --pkg  webkit2gtk-3.0  
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT3_CFLAGS)
+WEBKIT_CFLAGS = $(WEBKIT3_CFLAGS)
 WEBKKIT_LIBS = $(WEBKIT3_LIBS)
 endif
 
+AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(LIBGDA_CFLAGS) $(LIBVALA_CFLAGS) 
+
 bin_PROGRAMS = builder
 
 builder_PKGS = \