[gobject-introspection: 4/4] Merge branch '120-subdir-objects' into 'master'

[Emmanuele Bassi <ebassi src gnome org>]

commit 4f7a66a42c3897d986aff5d6d081d1ecb6af0ade
Merge: 6ada03c8 51717261
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Fri Feb 9 14:14:48 2018 +0000

    Merge branch '120-subdir-objects' into 'master'
    
    Resolve "[PATCH] adding subdir-objects to AM_INIT_AUTOMAKE"
    
    Closes #120
    
    See merge request GNOME/gobject-introspection!2

 Makefile-giscanner.am        | 12 ++++++------
 configure.ac                 |  2 +-
 docs/reference/Makefile.am   |  2 +-
 tests/offsets/Makefile.am    |  2 +-
 tests/repository/Makefile.am |  8 ++++----
 tests/scanner/Makefile.am    | 22 +++++++++++-----------
 6 files changed, 24 insertions(+), 24 deletions(-)
---