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:
d37fd95
)
src/Makefile.am
author
Alan Knowles
<alan@roojs.com>
Mon, 13 Jun 2016 01:49:07 +0000
(09:49 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 13 Jun 2016 01:49:07 +0000
(09:49 +0800)
src/Makefile.am
patch
|
blob
|
history
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
c4db7e7
..
0eb336e
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,38
+1,38
@@
if HAVE_LIBVALA22
if HAVE_LIBVALA22
-builder_LIBVALA = --pkg libvala-0.22
+
roojs
builder_LIBVALA = --pkg libvala-0.22
endif
if HAVE_LIBVALA24
endif
if HAVE_LIBVALA24
-builder_LIBVALA = --pkg libvala-0.24
+
roojs
builder_LIBVALA = --pkg libvala-0.24
endif
if HAVE_LIBVALA26
endif
if HAVE_LIBVALA26
-builder_LIBVALA = --pkg libvala-0.26
+
roojs
builder_LIBVALA = --pkg libvala-0.26
endif
if HAVE_LIBVALA28
endif
if HAVE_LIBVALA28
-builder_LIBVALA = --pkg libvala-0.28
+
roojs
builder_LIBVALA = --pkg libvala-0.28
endif
if HAVE_LIBVALA30
endif
if HAVE_LIBVALA30
-builder_LIBVALA = --pkg libvala-0.30
+
roojs
builder_LIBVALA = --pkg libvala-0.30
endif
if HAVE_LIBVALA32
endif
if HAVE_LIBVALA32
-builder_LIBVALA = --pkg libvala-0.32
+
roojs
builder_LIBVALA = --pkg libvala-0.32
endif
# gda
if HAVE_GDA5
endif
# gda
if HAVE_GDA5
-builder_GDA = --pkg libgda-5.0
+
roojs
builder_GDA = --pkg libgda-5.0
endif
if HAVE_GDA4
endif
if HAVE_GDA4
-builder_GDA = --pkg libgda-4.0
+
roojs
builder_GDA = --pkg libgda-4.0
endif
endif
@@
-40,31
+40,31
@@
endif
if HAVE_WEBKIT4
if HAVE_WEBKIT4
-builder_WEBKKIT = --pkg webkit2gtk-4.0
+
roojs
builder_WEBKKIT = --pkg webkit2gtk-4.0
endif
if HAVE_WEBKIT3
endif
if HAVE_WEBKIT3
-builder_WEBKKIT = --pkg webkit2gtk-3.0
+
roojs
builder_WEBKKIT = --pkg webkit2gtk-3.0
endif
# vte
if HAVE_VTE_2_91
endif
# vte
if HAVE_VTE_2_91
-builder_VTE = --pkg vte-2.91
+
roojs
builder_VTE = --pkg vte-2.91
endif
if HAVE_VTE_2_90
endif
if HAVE_VTE_2_90
-builder_VTE = --pkg vte-2.90
+
roojs
builder_VTE = --pkg vte-2.90
endif
# - not sure if needed....
endif
# - not sure if needed....
-AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(GDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) $(VTE_CFLAGS)
+AM_CPPFLAGS = $(
ROOJS
BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(GDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) $(VTE_CFLAGS)
-bin_PROGRAMS =
builder4
+bin_PROGRAMS =
roojsbuilder
-
builder4
_PKGS = \
+
roojsbuilder
_PKGS = \
--pkg glib-2.0 \
--pkg gobject-2.0 \
--pkg gtk+-3.0 \
--pkg glib-2.0 \
--pkg gobject-2.0 \
--pkg gtk+-3.0 \
@@
-78,11
+78,11
@@
builder4_PKGS = \
--pkg libsoup-2.4 \
--pkg javascriptcore \
--pkg roojspacker-1.0 \
--pkg libsoup-2.4 \
--pkg javascriptcore \
--pkg roojspacker-1.0 \
- $(builder_LIBVALA) \
- $(builder_GDA) \
- $(builder_WEBKKIT) \
- $(builder_JAVASCRIPTCOREGTK) \
- $(builder_VTE) \
+ $(
roojs
builder_LIBVALA) \
+ $(
roojs
builder_GDA) \
+ $(
roojs
builder_WEBKKIT) \
+ $(
roojs
builder_JAVASCRIPTCOREGTK) \
+ $(
roojs
builder_VTE) \
--pkg posix
--pkg posix
@@
-147,7
+147,7
@@
BUIDERUI = \
Builder4/ValaCompileResults.vala \
Builder4/PopoverProperty.vala
Builder4/ValaCompileResults.vala \
Builder4/PopoverProperty.vala
-
builder4
_SOURCES = \
+
roojsbuilder
_SOURCES = \
Application.vala \
Main.vala \
Spawn.vala \
Application.vala \
Main.vala \
Spawn.vala \
@@
-162,10
+162,10
@@
builder4_SOURCES = \
-
builder4
_VALAFLAGS = \
- --thread -X -lm --target-glib=2.32 --vapidir=$(srcdir)/vapi -g $(
builder4
_PKGS)
+
roojsbuilder
_VALAFLAGS = \
+ --thread -X -lm --target-glib=2.32 --vapidir=$(srcdir)/vapi -g $(
roojsbuilder
_PKGS)
-
builder4_LDADD = $(
BUILDER_LIBS) $(LIBVALA_LIBS) $(GDA_LIBS) $(WEBKIT_LIBS) $(VTE_LIBS) $(JAVASCRIPTCOREGTK_LIBS)
+
roojsbuilder_LDADD = $(ROOJS
BUILDER_LIBS) $(LIBVALA_LIBS) $(GDA_LIBS) $(WEBKIT_LIBS) $(VTE_LIBS) $(JAVASCRIPTCOREGTK_LIBS)