projects
/
app.Builder.js
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ffd4b98
)
src/Makefile.am
author
Alan Knowles
<alan@roojs.com>
Tue, 28 Apr 2015 02:48:52 +0000
(10:48 +0800)
committer
Alan Knowles
<alan@roojs.com>
Tue, 28 Apr 2015 02:48:52 +0000
(10:48 +0800)
src/Makefile.am
patch
|
blob
|
history
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
675b51d
..
d9ec10e
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-2,26
+2,26
@@
if HAVE_LIBVALA_0_22_X
builder_LIBVALA = --pkg libvala-0.22
if HAVE_LIBVALA_0_22_X
builder_LIBVALA = --pkg libvala-0.22
-
AM_CPP
FLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_22_X_CFLAGS)
+
LIBVALA_C
FLAGS = $(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
LIBVALA_LIBS = $(LIBVALA_0_22_X_LIBS)
endif
if HAVE_LIBVALA_0_24_X
builder_LIBVALA = --pkg libvala-0.24
-
AM_CPP
FLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_24_X_CFLAGS)
+
LIBVALA_C
FLAGS = $(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
LIBVALA_LIBS = $(LIBVALA_0_24_X_LIBS)
endif
if HAVE_LIBVALA_0_26_X
builder_LIBVALA = --pkg libvala-0.26
-
AM_CPP
FLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_26_X_CFLAGS)
+
LIBVALA_C
FLAGS = $(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
LIBVALA_LIBS = $(LIBVALA_0_26_X_LIBS)
endif
if HAVE_LIBVALA_0_28_X
builder_LIBVALA = --pkg libvala-0.28
-
AM_CPP
FLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_28_X_CFLAGS)
+
LIBVALA_C
FLAGS = $(BUILDER_CFLAGS) $(LIBVALA_0_28_X_CFLAGS)
LIBVALA_LIBS = $(LIBVALA_0_28_X_LIBS)
endif
LIBVALA_LIBS = $(LIBVALA_0_28_X_LIBS)
endif
@@
-30,13
+30,13
@@
endif
if HAVE_GDA5
builder_LIBGDA = --pkg libgda-5.0
if HAVE_GDA5
builder_LIBGDA = --pkg libgda-5.0
-
AM_CPP
FLAGS = $(BUILDER_CFLAGS) $(LIBGDA5_CFLAGS)
+
LIBGDA_C
FLAGS = $(BUILDER_CFLAGS) $(LIBGDA5_CFLAGS)
LIBGDA_LIBS = $(LIBGDA5_LIBS)
endif
if HAVE_GDA4
builder_LIBGDA = --pkg libgda-4.0
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
LIBGDA_LIBS = $(LIBGDA4_LIBS)
endif
@@
-46,16
+46,18
@@
endif
if HAVE_WEBKIT4
builder_WEBKKIT = --pkg webkit2gtk-4.0
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
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
WEBKKIT_LIBS = $(WEBKIT3_LIBS)
endif
+AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(LIBGDA_CFLAGS) $(LIBVALA_CFLAGS)
+
bin_PROGRAMS = builder
builder_PKGS = \
bin_PROGRAMS = builder
builder_PKGS = \