summaryrefslogtreecommitdiff
path: root/gee
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2014-05-29 16:24:17 +0200
committerJürg Billeter <j@bitron.ch>2014-08-24 10:23:57 +0200
commit797a15747b7c0cb43ea7e13687f1af34f6e14ddf (patch)
treee37332910ece6c96de214c748383ba6e77407e81 /gee
parent166a5960daf834e6df042579c3c65b087554f491 (diff)
downloadvala-797a15747b7c0cb43ea7e13687f1af34f6e14ddf.tar.gz
build: Avoid using ".." for referencing paths and reorganize valac-calls
Diffstat (limited to 'gee')
-rw-r--r--gee/Makefile.am15
1 files changed, 10 insertions, 5 deletions
diff --git a/gee/Makefile.am b/gee/Makefile.am
index f9ac2fcdd..db4e75bd9 100644
--- a/gee/Makefile.am
+++ b/gee/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.common
+
NULL =
AM_CPPFLAGS = \
@@ -36,7 +38,14 @@ geeinclude_HEADERS = \
$(NULL)
gee.vapi gee.vala.stamp: $(libgee_la_VALASOURCES)
- $(VALA_V)$(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 -H valagee.h --library gee $^
+ $(VALA_V)$(VALAC) \
+ $(COVERAGE_VALAFLAGS) \
+ $(VALAFLAGS) \
+ -C \
+ --vapidir $(top_srcdir)/vapi --pkg gobject-2.0 \
+ -H valagee.h \
+ --library gee \
+ $^
@touch $@
libgee_la_LIBADD = \
@@ -51,7 +60,3 @@ MAINTAINERCLEANFILES = \
valagee.h \
$(libgee_la_VALASOURCES:.vala=.c) \
$(NULL)
-
-VALA_V = $(VALA_V_$(V))
-VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
-VALA_V_0 = @echo " VALAC " $^;