diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2014-05-29 16:24:17 +0200 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2014-08-24 10:23:57 +0200 |
| commit | 797a15747b7c0cb43ea7e13687f1af34f6e14ddf (patch) | |
| tree | e37332910ece6c96de214c748383ba6e77407e81 /ccode/Makefile.am | |
| parent | 166a5960daf834e6df042579c3c65b087554f491 (diff) | |
| download | vala-797a15747b7c0cb43ea7e13687f1af34f6e14ddf.tar.gz | |
build: Avoid using ".." for referencing paths and reorganize valac-calls
Diffstat (limited to 'ccode/Makefile.am')
| -rw-r--r-- | ccode/Makefile.am | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/ccode/Makefile.am b/ccode/Makefile.am index eb25f9dd4..fd3186a87 100644 --- a/ccode/Makefile.am +++ b/ccode/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.common + NULL = AM_CPPFLAGS = \ @@ -79,7 +81,16 @@ ccodeinclude_HEADERS = \ $(NULL) ccode.vapi ccode.vala.stamp: $(libvalaccode_la_VALASOURCES) - $(VALA_V)$(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir $(srcdir)/../gee --pkg gee --pkg config -H valaccode.h --library ccode $^ + $(VALA_V)$(VALAC) \ + $(COVERAGE_VALAFLAGS) \ + $(VALAFLAGS) \ + -C \ + --vapidir $(top_srcdir)/vapi --pkg gobject-2.0 \ + --vapidir $(top_srcdir)/gee --pkg gee \ + --pkg config \ + -H valaccode.h \ + --library ccode \ + $^ touch $@ libvalaccode_la_LIBADD = \ @@ -94,7 +105,3 @@ MAINTAINERCLEANFILES = \ valaccode.h \ $(libvalaccode_la_VALASOURCES:.vala=.c) \ $(NULL) - -VALA_V = $(VALA_V_$(V)) -VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY)) -VALA_V_0 = @echo " VALAC " $^; |