build: Avoid using ".." for referencing paths and reorganize valac-calls

diff --git a/Makefile.common b/Makefile.common
new file mode 100644 (file)
index 0000000..5e9692f
--- /dev/null
+++ b/Makefile.common
@@ -0,0 +1,3 @@
+VALA_V = $(VALA_V_$(V))
+VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
+VALA_V_0 = @echo "  VALAC " $^;

diff --git a/ccode/Makefile.am b/ccode/Makefile.am
index eb25f9dd44a8c06d9003c82a5b874adcccc8784d..fd3186a871a25d251f44e875a92484bcda7dca71 100644 (file)
--- 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 " $^;

diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index 33e0c1a00be729a4e216e1859b88a3f9da376cc9..a20e24f36a134142958d8cda1612d2c3e8f44184 100644 (file)
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.common
+
 NULL =
 
 AM_CPPFLAGS = \
@@ -57,7 +59,17 @@ codegeninclude_HEADERS = \
        $(NULL)
 
 codegen.vapi codegen.vala.stamp: $(libvala_la_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 -H valacodegen.h --library codegen $^
+       $(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 \
+               -H valacodegen.h \
+               --library codegen \
+               $^
        @touch $@
 
 libvala@PACKAGE_SUFFIX@_la_LDFLAGS = -no-undefined
@@ -65,8 +77,8 @@ libvala@PACKAGE_SUFFIX@_la_LDFLAGS = -no-undefined
 libvala@PACKAGE_SUFFIX@_la_LIBADD = \
        $(COVERAGE_LIBS) \
        $(GLIB_LIBS) \
-       ../vala/libvalacore.la \
-       ../ccode/libvalaccode.la \
+       $(top_builddir)/vala/libvalacore.la \
+       $(top_builddir)/ccode/libvalaccode.la \
        $(NULL)
 
 EXTRA_DIST = $(libvala_la_VALASOURCES) codegen.vapi codegen.vala.stamp
@@ -76,8 +88,3 @@ MAINTAINERCLEANFILES = \
        valacodegen.h \
        $(libvala_la_VALASOURCES:.vala=.c) \
        $(NULL)
-
-VALA_V = $(VALA_V_$(V))
-VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
-VALA_V_0 = @echo "  VALAC " $^;
-

diff --git a/compiler/Makefile.am b/compiler/Makefile.am
index d6e7f819b8012e6c33a558bb37a8b97ba090297d..1a513faa590d845feea4d143313bfe0043324952 100644 (file)
--- 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 " $^;

diff --git a/gee/Makefile.am b/gee/Makefile.am
index f9ac2fcdd9667ce8c805c3322b098e75717a5e04..db4e75bd96fcd39e49dba91fbe8d71ad92ceafc7 100644 (file)
--- 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 " $^;

diff --git a/vala/Makefile.am b/vala/Makefile.am
index ee8d41012b4f1dbd154a885bb8b756016d123569..54d01bde7a71a6cb22bc58ebc323e7ca3bb67f5a 100644 (file)
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.common
+
 NULL =
 
 AM_CPPFLAGS = \
@@ -173,13 +175,22 @@ valainclude_HEADERS = \
        $(NULL)
 
 vala.vapi vala.vala.stamp: $(libvalacore_la_VALASOURCES)
-       $(VALA_V)$(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir $(srcdir)/../gee --pkg gee --pkg config -H vala.h --library vala $^
+       $(VALA_V)$(VALAC) \
+               $(COVERAGE_VALAFLAGS) \
+               $(VALAFLAGS) \
+               -C \
+               --vapidir $(top_srcdir)/vapi --pkg gobject-2.0 \
+               --vapidir $(top_srcdir)/gee --pkg gee \
+               --pkg config \
+               -H vala.h \
+               --library vala \
+               $^
        @touch $@
 
 libvalacore_la_LIBADD = \
        $(COVERAGE_LIBS) \
        $(GLIB_LIBS) \
-       ../gee/libgee.la \
+       $(top_builddir)/gee/libgee.la \
        $(NULL)
 
 EXTRA_DIST = $(libvalacore_la_VALASOURCES) vala.vapi vala.vala.stamp
@@ -189,7 +200,3 @@ MAINTAINERCLEANFILES = \
        vala.h \
        $(libvalacore_la_VALASOURCES:.vala=.c) \
        $(NULL)
-
-VALA_V = $(VALA_V_$(V))
-VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
-VALA_V_0 = @echo "  VALAC " $^;

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 638cbfa017ff4399ac37e8f0e6f1ab839cc2fecc..f9cb467df09a6c879945a30a9eac5db0a937d8ca 100644 (file)
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 vapidir = $(pkgdatadir)/vapi
 
-libvala@PACKAGE_SUFFIX@.vapi: ../gee/gee.vapi ../ccode/ccode.vapi ../vala/vala.vapi ../codegen/codegen.vapi
+libvala@PACKAGE_SUFFIX@.vapi: $(top_srcdir)/gee/gee.vapi $(top_srcdir)/ccode/ccode.vapi $(top_srcdir)/vala/vala.vapi $(top_srcdir)/codegen/codegen.vapi
        cat $^ > $@
 
 dist_vapi_DATA = \

diff --git a/vapigen/Makefile.am b/vapigen/Makefile.am
index bc8539ae5c8584f78118ec3806f364217c298bb2..39fc8702cdcb43289db6f9c33f1fb40c6875c743 100644 (file)
--- a/vapigen/Makefile.am
+++ b/vapigen/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.common
+
 NULL =
 
 VALAC = $(top_builddir)/compiler/valac$(EXEEXT)
@@ -41,23 +43,41 @@ vapicheck_SOURCES = \
        $(NULL)
 
 vapigen.vala.stamp: $(vapigen_VALASOURCES)
-       $(VALA_V)$(VALAC) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --vapidir $(srcdir)/../gee --pkg gee --vapidir $(srcdir)/../ccode --pkg ccode --vapidir $(srcdir)/../vala --pkg vala --vapidir $(srcdir)/../gobject-introspection --pkg gidl --pkg config $^
+       $(VALA_V)$(VALAC) \
+               $(VALAFLAGS) \
+               -C \
+               --vapidir $(top_srcdir)/vapi \
+               --vapidir $(top_srcdir)/gee --pkg gee \
+               --vapidir $(top_srcdir)/ccode --pkg ccode \
+               --vapidir $(top_srcdir)/vala --pkg vala \
+               --vapidir $(top_srcdir)/gobject-introspection --pkg gidl \
+               --pkg config \
+               $^
        @touch $@
 
 vapicheck.vala.stamp: $(vapicheck_VALASOURCES)
-       $(VALA_V)$(VALAC) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --vapidir $(srcdir)/../gee --pkg gee --vapidir $(srcdir)/../ccode --pkg ccode --vapidir $(srcdir)/../vala --pkg vala --vapidir $(srcdir)/../gobject-introspection --pkg gidl --pkg config $^
+       $(VALA_V)$(VALAC) \
+               $(VALAFLAGS) \
+               -C \
+               --vapidir $(top_srcdir)/vapi \
+               --vapidir $(top_srcdir)/gee --pkg gee \
+               --vapidir $(top_srcdir)/ccode --pkg ccode \
+               --vapidir $(top_srcdir)/vala --pkg vala \
+               --vapidir $(top_srcdir)/gobject-introspection --pkg gidl \
+               --pkg config \
+               $^
        @touch $@
 
 vapigen_LDADD = \
        $(GLIB_LIBS) \
-       ../codegen/libvala@PACKAGE_SUFFIX@.la \
-       ../gobject-introspection/libgidl.la \
+       $(top_builddir)/codegen/libvala@PACKAGE_SUFFIX@.la \
+       $(top_builddir)/gobject-introspection/libgidl.la \
        $(NULL)
 
 vapicheck_LDADD = \
        $(GLIB_LIBS) \
-       ../codegen/libvala@PACKAGE_SUFFIX@.la \
-       ../gobject-introspection/libgidl.la \
+       $(top_builddir)/codegen/libvala@PACKAGE_SUFFIX@.la \
+       $(top_builddir)/gobject-introspection/libgidl.la \
        $(NULL)
 
 if ENABLE_UNVERSIONED
@@ -100,7 +120,3 @@ MAINTAINERCLEANFILES = \
        $(vapigen_VALASOURCES:.vala=.c) \
        $(vapicheck_VALASOURCES:.vala=.c) \
        $(NULL)
-
-VALA_V = $(VALA_V_$(V))
-VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
-VALA_V_0 = @echo "  VALAC " $^;