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 /compiler | |
| parent | 166a5960daf834e6df042579c3c65b087554f491 (diff) | |
| download | vala-797a15747b7c0cb43ea7e13687f1af34f6e14ddf.tar.gz | |
build: Avoid using ".." for referencing paths and reorganize valac-calls
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/Makefile.am | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/compiler/Makefile.am b/compiler/Makefile.am index d6e7f819b..1a513faa5 100644 --- a/compiler/Makefile.am +++ b/compiler/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.common + NULL = AM_CPPFLAGS = \ @@ -26,13 +28,23 @@ valac_SOURCES = \ $(NULL) valac.vala.stamp: $(valac_VALASOURCES) - $(VALA_V)$(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir $(srcdir)/../gee --pkg gee --vapidir $(srcdir)/../ccode --pkg ccode --vapidir $(srcdir)/../vala --pkg vala --vapidir $(srcdir)/../codegen --pkg codegen --pkg config $^ + $(VALA_V)$(VALAC) \ + $(COVERAGE_VALAFLAGS) \ + $(VALAFLAGS) \ + -C \ + --vapidir $(top_srcdir)/vapi --pkg gobject-2.0 \ + --vapidir $(top_srcdir)/gee --pkg gee \ + --vapidir $(top_srcdir)/ccode --pkg ccode \ + --vapidir $(top_srcdir)/vala --pkg vala \ + --vapidir $(top_srcdir)/codegen --pkg codegen \ + --pkg config \ + $^ @touch $@ valac_LDADD = \ $(COVERAGE_LIBS) \ $(GLIB_LIBS) \ - ../codegen/libvala@PACKAGE_SUFFIX@.la \ + $(top_builddir)/codegen/libvala@PACKAGE_SUFFIX@.la \ $(NULL) EXTRA_DIST = $(valac_VALASOURCES) valac.vala.stamp @@ -47,7 +59,3 @@ endif MAINTAINERCLEANFILES = \ $(valac_VALASOURCES:.vala=.c) \ $(NULL) - -VALA_V = $(VALA_V_$(V)) -VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY)) -VALA_V_0 = @echo " VALAC " $^; |