Imported Upstream version 1.55.2

diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am
index b0e1373..06bc4be 100644 (file)
--- a/Makefile-giscanner.am
+++ b/Makefile-giscanner.am
@@ -1,15 +1,15 @@
 ## Process this file with automake to produce Makefile.in
 
-BUILT_SOURCES +=               \
-       scannerparser.c         \
-       scannerparser.h         \
-       scannerlexer.c          \
-       scannerlexer.h
+BUILT_SOURCES +=                       \
+       giscanner/scannerparser.c       \
+       giscanner/scannerparser.h       \
+       giscanner/scannerlexer.c        \
+       giscanner/scannerlexer.h
 
 AM_YFLAGS = -d -t
 
 # Why do I have to do this automake?
-scannerlexer.h: scannerlexer.c
+giscanner/scannerlexer.h: giscanner/scannerlexer.c
 
 noinst_LTLIBRARIES += libgiscanner.la
 

diff --git a/Makefile.in b/Makefile.in
index f7544bd..a3d8822 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -260,7 +260,8 @@ am__DEPENDENCIES_1 =
 @OS_WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 _giscanner_la_DEPENDENCIES = libgiscanner.la $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_2)
-am__giscanner_la_OBJECTS = _giscanner_la-giscannermodule.lo
+am__dirstamp = $(am__leading_dot)dirstamp
+am__giscanner_la_OBJECTS = giscanner/_giscanner_la-giscannermodule.lo
 _giscanner_la_OBJECTS = $(am__giscanner_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -270,40 +271,54 @@ _giscanner_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(_giscanner_la_CFLAGS) \
        $(CFLAGS) $(_giscanner_la_LDFLAGS) $(LDFLAGS) -o $@
 libcmph_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libcmph_la_OBJECTS = libcmph_la-bdz.lo libcmph_la-bdz_ph.lo \
-       libcmph_la-bmz8.lo libcmph_la-bmz.lo libcmph_la-brz.lo \
-       libcmph_la-buffer_entry.lo libcmph_la-buffer_manager.lo \
-       libcmph_la-chd.lo libcmph_la-chd_ph.lo libcmph_la-chm.lo \
-       libcmph_la-cmph.lo libcmph_la-cmph_structs.lo \
-       libcmph_la-compressed_rank.lo libcmph_la-compressed_seq.lo \
-       libcmph_la-fch_buckets.lo libcmph_la-fch.lo \
-       libcmph_la-graph.lo libcmph_la-hash.lo \
-       libcmph_la-jenkins_hash.lo libcmph_la-miller_rabin.lo \
-       libcmph_la-select.lo libcmph_la-vqueue.lo libcmph_la-vstack.lo
+am_libcmph_la_OBJECTS = girepository/cmph/libcmph_la-bdz.lo \
+       girepository/cmph/libcmph_la-bdz_ph.lo \
+       girepository/cmph/libcmph_la-bmz8.lo \
+       girepository/cmph/libcmph_la-bmz.lo \
+       girepository/cmph/libcmph_la-brz.lo \
+       girepository/cmph/libcmph_la-buffer_entry.lo \
+       girepository/cmph/libcmph_la-buffer_manager.lo \
+       girepository/cmph/libcmph_la-chd.lo \
+       girepository/cmph/libcmph_la-chd_ph.lo \
+       girepository/cmph/libcmph_la-chm.lo \
+       girepository/cmph/libcmph_la-cmph.lo \
+       girepository/cmph/libcmph_la-cmph_structs.lo \
+       girepository/cmph/libcmph_la-compressed_rank.lo \
+       girepository/cmph/libcmph_la-compressed_seq.lo \
+       girepository/cmph/libcmph_la-fch_buckets.lo \
+       girepository/cmph/libcmph_la-fch.lo \
+       girepository/cmph/libcmph_la-graph.lo \
+       girepository/cmph/libcmph_la-hash.lo \
+       girepository/cmph/libcmph_la-jenkins_hash.lo \
+       girepository/cmph/libcmph_la-miller_rabin.lo \
+       girepository/cmph/libcmph_la-select.lo \
+       girepository/cmph/libcmph_la-vqueue.lo \
+       girepository/cmph/libcmph_la-vstack.lo
 libcmph_la_OBJECTS = $(am_libcmph_la_OBJECTS)
 libgirepository_1_0_la_DEPENDENCIES = libgirepository-gthash.la \
        $(am__DEPENDENCIES_1)
-am_libgirepository_1_0_la_OBJECTS = libgirepository_1_0_la-gdump.lo \
-       libgirepository_1_0_la-giarginfo.lo \
-       libgirepository_1_0_la-gibaseinfo.lo \
-       libgirepository_1_0_la-gicallableinfo.lo \
-       libgirepository_1_0_la-giconstantinfo.lo \
-       libgirepository_1_0_la-gienuminfo.lo \
-       libgirepository_1_0_la-gifieldinfo.lo \
-       libgirepository_1_0_la-gifunctioninfo.lo \
-       libgirepository_1_0_la-ginvoke.lo \
-       libgirepository_1_0_la-giinterfaceinfo.lo \
-       libgirepository_1_0_la-giobjectinfo.lo \
-       libgirepository_1_0_la-gipropertyinfo.lo \
-       libgirepository_1_0_la-giregisteredtypeinfo.lo \
-       libgirepository_1_0_la-girepository.lo \
-       libgirepository_1_0_la-girffi.lo \
-       libgirepository_1_0_la-gisignalinfo.lo \
-       libgirepository_1_0_la-gistructinfo.lo \
-       libgirepository_1_0_la-gitypeinfo.lo \
-       libgirepository_1_0_la-gitypelib.lo \
-       libgirepository_1_0_la-giunioninfo.lo \
-       libgirepository_1_0_la-givfuncinfo.lo
+am_libgirepository_1_0_la_OBJECTS =  \
+       girepository/libgirepository_1_0_la-gdump.lo \
+       girepository/libgirepository_1_0_la-giarginfo.lo \
+       girepository/libgirepository_1_0_la-gibaseinfo.lo \
+       girepository/libgirepository_1_0_la-gicallableinfo.lo \
+       girepository/libgirepository_1_0_la-giconstantinfo.lo \
+       girepository/libgirepository_1_0_la-gienuminfo.lo \
+       girepository/libgirepository_1_0_la-gifieldinfo.lo \
+       girepository/libgirepository_1_0_la-gifunctioninfo.lo \
+       girepository/libgirepository_1_0_la-ginvoke.lo \
+       girepository/libgirepository_1_0_la-giinterfaceinfo.lo \
+       girepository/libgirepository_1_0_la-giobjectinfo.lo \
+       girepository/libgirepository_1_0_la-gipropertyinfo.lo \
+       girepository/libgirepository_1_0_la-giregisteredtypeinfo.lo \
+       girepository/libgirepository_1_0_la-girepository.lo \
+       girepository/libgirepository_1_0_la-girffi.lo \
+       girepository/libgirepository_1_0_la-gisignalinfo.lo \
+       girepository/libgirepository_1_0_la-gistructinfo.lo \
+       girepository/libgirepository_1_0_la-gitypeinfo.lo \
+       girepository/libgirepository_1_0_la-gitypelib.lo \
+       girepository/libgirepository_1_0_la-giunioninfo.lo \
+       girepository/libgirepository_1_0_la-givfuncinfo.lo
 libgirepository_1_0_la_OBJECTS = $(am_libgirepository_1_0_la_OBJECTS)
 libgirepository_1_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -312,7 +327,7 @@ libgirepository_1_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 libgirepository_gthash_la_DEPENDENCIES = libcmph.la \
        $(am__DEPENDENCIES_1)
 am_libgirepository_gthash_la_OBJECTS =  \
-       libgirepository_gthash_la-gthash.lo
+       girepository/libgirepository_gthash_la-gthash.lo
 libgirepository_gthash_la_OBJECTS =  \
        $(am_libgirepository_gthash_la_OBJECTS)
 libgirepository_gthash_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -322,11 +337,11 @@ libgirepository_gthash_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 libgirepository_internals_la_DEPENDENCIES = libgirepository-gthash.la \
        $(am__DEPENDENCIES_1)
 am_libgirepository_internals_la_OBJECTS =  \
-       libgirepository_internals_la-girmodule.lo \
-       libgirepository_internals_la-girnode.lo \
-       libgirepository_internals_la-giroffsets.lo \
-       libgirepository_internals_la-girparser.lo \
-       libgirepository_internals_la-girwriter.lo
+       girepository/libgirepository_internals_la-girmodule.lo \
+       girepository/libgirepository_internals_la-girnode.lo \
+       girepository/libgirepository_internals_la-giroffsets.lo \
+       girepository/libgirepository_internals_la-girparser.lo \
+       girepository/libgirepository_internals_la-girwriter.lo
 libgirepository_internals_la_OBJECTS =  \
        $(am_libgirepository_internals_la_OBJECTS)
 libgirepository_internals_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -335,9 +350,10 @@ libgirepository_internals_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(LDFLAGS) -o $@
 libgiscanner_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
-am_libgiscanner_la_OBJECTS = libgiscanner_la-sourcescanner.lo \
-       libgiscanner_la-scannerlexer.lo \
-       libgiscanner_la-scannerparser.lo
+am_libgiscanner_la_OBJECTS =  \
+       giscanner/libgiscanner_la-sourcescanner.lo \
+       giscanner/libgiscanner_la-scannerlexer.lo \
+       giscanner/libgiscanner_la-scannerparser.lo
 libgiscanner_la_OBJECTS = $(am_libgiscanner_la_OBJECTS)
 libgiscanner_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -345,27 +361,28 @@ libgiscanner_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        -o $@
 @OS_WIN32_FALSE@am__EXEEXT_1 = gi-dump-types$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-am_cmph_bdz_test_OBJECTS = cmph_bdz_test-cmph-bdz-test.$(OBJEXT)
+am_cmph_bdz_test_OBJECTS =  \
+       girepository/cmph_bdz_test-cmph-bdz-test.$(OBJEXT)
 cmph_bdz_test_OBJECTS = $(am_cmph_bdz_test_OBJECTS)
 cmph_bdz_test_DEPENDENCIES = libcmph.la $(am__DEPENDENCIES_1)
 cmph_bdz_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(cmph_bdz_test_CFLAGS) \
        $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_g_ir_compiler_OBJECTS = g_ir_compiler-compiler.$(OBJEXT)
+am_g_ir_compiler_OBJECTS = tools/g_ir_compiler-compiler.$(OBJEXT)
 g_ir_compiler_OBJECTS = $(am_g_ir_compiler_OBJECTS)
 g_ir_compiler_DEPENDENCIES = libgirepository-internals.la \
        libgirepository-1.0.la $(am__DEPENDENCIES_1)
 g_ir_compiler_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(g_ir_compiler_CFLAGS) \
        $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_g_ir_generate_OBJECTS = g_ir_generate-generate.$(OBJEXT)
+am_g_ir_generate_OBJECTS = tools/g_ir_generate-generate.$(OBJEXT)
 g_ir_generate_OBJECTS = $(am_g_ir_generate_OBJECTS)
 g_ir_generate_DEPENDENCIES = libgirepository-internals.la \
        libgirepository-1.0.la $(am__DEPENDENCIES_1)
 g_ir_generate_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(g_ir_generate_CFLAGS) \
        $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_g_ir_inspect_OBJECTS = g_ir_inspect-g-ir-inspect.$(OBJEXT)
+am_g_ir_inspect_OBJECTS = tools/g_ir_inspect-g-ir-inspect.$(OBJEXT)
 g_ir_inspect_OBJECTS = $(am_g_ir_inspect_OBJECTS)
 g_ir_inspect_DEPENDENCIES = libgirepository-1.0.la \
        $(am__DEPENDENCIES_1)
@@ -375,22 +392,22 @@ g_ir_inspect_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 am__gi_dump_types_SOURCES_DIST = girepository/gdump.c \
        girepository/gi-dump-types.c
 @OS_WIN32_FALSE@am_gi_dump_types_OBJECTS =  \
-@OS_WIN32_FALSE@       gi_dump_types-gdump.$(OBJEXT) \
-@OS_WIN32_FALSE@       gi_dump_types-gi-dump-types.$(OBJEXT)
+@OS_WIN32_FALSE@       girepository/gi_dump_types-gdump.$(OBJEXT) \
+@OS_WIN32_FALSE@       girepository/gi_dump_types-gi-dump-types.$(OBJEXT)
 gi_dump_types_OBJECTS = $(am_gi_dump_types_OBJECTS)
 @OS_WIN32_FALSE@gi_dump_types_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 @OS_WIN32_FALSE@       $(am__DEPENDENCIES_1)
 gi_dump_types_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gi_dump_types_CFLAGS) \
        $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_glib_print_OBJECTS = glib_print-glib-print.$(OBJEXT)
+am_glib_print_OBJECTS = examples/glib_print-glib-print.$(OBJEXT)
 glib_print_OBJECTS = $(am_glib_print_OBJECTS)
 glib_print_DEPENDENCIES = libgirepository-1.0.la $(am__DEPENDENCIES_1)
 glib_print_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(glib_print_CFLAGS) \
        $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_gthash_test_OBJECTS = gthash_test-gthash.$(OBJEXT) \
-       gthash_test-gthash-test.$(OBJEXT)
+am_gthash_test_OBJECTS = girepository/gthash_test-gthash.$(OBJEXT) \
+       girepository/gthash_test-gthash-test.$(OBJEXT)
 gthash_test_OBJECTS = $(am_gthash_test_OBJECTS)
 gthash_test_DEPENDENCIES = libcmph.la libgirepository-1.0.la \
        $(am__DEPENDENCIES_1)
@@ -719,8 +736,8 @@ am__DIST_COMMON = $(srcdir)/Makefile-cmph.am \
        ChangeLog NEWS README TODO build-aux/compile \
        build-aux/config.guess build-aux/config.sub build-aux/depcomp \
        build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
-       build-aux/py-compile build-aux/ylwrap scannerlexer.c \
-       scannerparser.c scannerparser.h
+       build-aux/py-compile build-aux/ylwrap giscanner/scannerlexer.c \
+       giscanner/scannerparser.c giscanner/scannerparser.h
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -957,8 +974,9 @@ EXTRA_DIST = girepository/docs.c $(STATIC_GIRSOURCES) \
 lib_LTLIBRARIES = libgirepository-1.0.la
 noinst_LTLIBRARIES = libgirepository-internals.la \
        libgirepository-gthash.la libgiscanner.la
-BUILT_SOURCES = scannerparser.c scannerparser.h scannerlexer.c \
-       scannerlexer.h gir/cairo-1.0.gir
+BUILT_SOURCES = giscanner/scannerparser.c giscanner/scannerparser.h \
+       giscanner/scannerlexer.c giscanner/scannerlexer.h \
+       gir/cairo-1.0.gir
 CLEANFILES = $(BUILT_SOURCES) cmph-bdz-test libcmph.la gthash-test \
        gir/cairo-1.0.gir $(BUILT_GIRSOURCES) $(typelibs_DATA) \
        g-ir-scanner g-ir-annotation-tool g-ir-doc-tool g-ir-inspect
@@ -1052,7 +1070,7 @@ _gir_silent_scanner_opts_0 = --quiet
 _gir_silent_compiler = $(_gir_silent_compiler_$(V))
 _gir_silent_compiler_ = $(_gir_silent_compiler_$(_gir_verbosity))
 _gir_silent_compiler_0 = @echo "  GICOMP   $(1)";
-_gir_default_scanner_env = CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)"
+_gir_default_scanner_env = CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" GI_HOST_OS="$(GI_HOST_OS)" DLLTOOL="$(DLLTOOL)"
 libcmph_la_CPPFLAGS = -Icmph $(GLIB_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS)
 libcmph_la_LIBADD = -lm $(GLIB_LIBS)
 libcmph_la_SOURCES = \
@@ -1728,24 +1746,200 @@ clean-pkgpyexecLTLIBRARIES:
          echo rm -f $${locs}; \
          rm -f $${locs}; \
        }
+giscanner/$(am__dirstamp):
+       @$(MKDIR_P) giscanner
+       @: > giscanner/$(am__dirstamp)
+giscanner/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) giscanner/$(DEPDIR)
+       @: > giscanner/$(DEPDIR)/$(am__dirstamp)
+giscanner/_giscanner_la-giscannermodule.lo: giscanner/$(am__dirstamp) \
+       giscanner/$(DEPDIR)/$(am__dirstamp)
 
 _giscanner.la: $(_giscanner_la_OBJECTS) $(_giscanner_la_DEPENDENCIES) $(EXTRA__giscanner_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(_giscanner_la_LINK) -rpath $(pkgpyexecdir) $(_giscanner_la_OBJECTS) $(_giscanner_la_LIBADD) $(LIBS)
+girepository/cmph/$(am__dirstamp):
+       @$(MKDIR_P) girepository/cmph
+       @: > girepository/cmph/$(am__dirstamp)
+girepository/cmph/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) girepository/cmph/$(DEPDIR)
+       @: > girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-bdz.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-bdz_ph.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-bmz8.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-bmz.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-brz.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-buffer_entry.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-buffer_manager.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-chd.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-chd_ph.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-chm.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-cmph.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-cmph_structs.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-compressed_rank.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-compressed_seq.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-fch_buckets.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-fch.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-graph.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-hash.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-jenkins_hash.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-miller_rabin.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-select.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-vqueue.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+girepository/cmph/libcmph_la-vstack.lo:  \
+       girepository/cmph/$(am__dirstamp) \
+       girepository/cmph/$(DEPDIR)/$(am__dirstamp)
 
 libcmph.la: $(libcmph_la_OBJECTS) $(libcmph_la_DEPENDENCIES) $(EXTRA_libcmph_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(LINK)  $(libcmph_la_OBJECTS) $(libcmph_la_LIBADD) $(LIBS)
+girepository/$(am__dirstamp):
+       @$(MKDIR_P) girepository
+       @: > girepository/$(am__dirstamp)
+girepository/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) girepository/$(DEPDIR)
+       @: > girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-gdump.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-giarginfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-gibaseinfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-gicallableinfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-giconstantinfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-gienuminfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-gifieldinfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-gifunctioninfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-ginvoke.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-giinterfaceinfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-giobjectinfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-gipropertyinfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-giregisteredtypeinfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-girepository.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-girffi.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-gisignalinfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-gistructinfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-gitypeinfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-gitypelib.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-giunioninfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_1_0_la-givfuncinfo.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
 
 libgirepository-1.0.la: $(libgirepository_1_0_la_OBJECTS) $(libgirepository_1_0_la_DEPENDENCIES) $(EXTRA_libgirepository_1_0_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(libgirepository_1_0_la_LINK) -rpath $(libdir) $(libgirepository_1_0_la_OBJECTS) $(libgirepository_1_0_la_LIBADD) $(LIBS)
+girepository/libgirepository_gthash_la-gthash.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
 
 libgirepository-gthash.la: $(libgirepository_gthash_la_OBJECTS) $(libgirepository_gthash_la_DEPENDENCIES) $(EXTRA_libgirepository_gthash_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(libgirepository_gthash_la_LINK)  $(libgirepository_gthash_la_OBJECTS) $(libgirepository_gthash_la_LIBADD) $(LIBS)
+girepository/libgirepository_internals_la-girmodule.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_internals_la-girnode.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_internals_la-giroffsets.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_internals_la-girparser.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/libgirepository_internals_la-girwriter.lo:  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
 
 libgirepository-internals.la: $(libgirepository_internals_la_OBJECTS) $(libgirepository_internals_la_DEPENDENCIES) $(EXTRA_libgirepository_internals_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(libgirepository_internals_la_LINK)  $(libgirepository_internals_la_OBJECTS) $(libgirepository_internals_la_LIBADD) $(LIBS)
-scannerparser.h: scannerparser.c
-       @if test ! -f $@; then rm -f scannerparser.c; else :; fi
-       @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) scannerparser.c; else :; fi
+giscanner/libgiscanner_la-sourcescanner.lo: giscanner/$(am__dirstamp) \
+       giscanner/$(DEPDIR)/$(am__dirstamp)
+giscanner/libgiscanner_la-scannerlexer.lo: giscanner/$(am__dirstamp) \
+       giscanner/$(DEPDIR)/$(am__dirstamp)
+giscanner/scannerparser.h: giscanner/scannerparser.c
+       @if test ! -f $@; then rm -f giscanner/scannerparser.c; else :; fi
+       @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) giscanner/scannerparser.c; else :; fi
+giscanner/libgiscanner_la-scannerparser.lo: giscanner/$(am__dirstamp) \
+       giscanner/$(DEPDIR)/$(am__dirstamp)
 
 libgiscanner.la: $(libgiscanner_la_OBJECTS) $(libgiscanner_la_DEPENDENCIES) $(EXTRA_libgiscanner_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(libgiscanner_la_LINK)  $(libgiscanner_la_OBJECTS) $(libgiscanner_la_LIBADD) $(LIBS)
@@ -1816,30 +2010,65 @@ clean-noinstPROGRAMS:
        list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
        echo " rm -f" $$list; \
        rm -f $$list
+girepository/cmph_bdz_test-cmph-bdz-test.$(OBJEXT):  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
 
 cmph-bdz-test$(EXEEXT): $(cmph_bdz_test_OBJECTS) $(cmph_bdz_test_DEPENDENCIES) $(EXTRA_cmph_bdz_test_DEPENDENCIES) 
        @rm -f cmph-bdz-test$(EXEEXT)
        $(AM_V_CCLD)$(cmph_bdz_test_LINK) $(cmph_bdz_test_OBJECTS) $(cmph_bdz_test_LDADD) $(LIBS)
+tools/$(am__dirstamp):
+       @$(MKDIR_P) tools
+       @: > tools/$(am__dirstamp)
+tools/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) tools/$(DEPDIR)
+       @: > tools/$(DEPDIR)/$(am__dirstamp)
+tools/g_ir_compiler-compiler.$(OBJEXT): tools/$(am__dirstamp) \
+       tools/$(DEPDIR)/$(am__dirstamp)
 
 g-ir-compiler$(EXEEXT): $(g_ir_compiler_OBJECTS) $(g_ir_compiler_DEPENDENCIES) $(EXTRA_g_ir_compiler_DEPENDENCIES) 
        @rm -f g-ir-compiler$(EXEEXT)
        $(AM_V_CCLD)$(g_ir_compiler_LINK) $(g_ir_compiler_OBJECTS) $(g_ir_compiler_LDADD) $(LIBS)
+tools/g_ir_generate-generate.$(OBJEXT): tools/$(am__dirstamp) \
+       tools/$(DEPDIR)/$(am__dirstamp)
 
 g-ir-generate$(EXEEXT): $(g_ir_generate_OBJECTS) $(g_ir_generate_DEPENDENCIES) $(EXTRA_g_ir_generate_DEPENDENCIES) 
        @rm -f g-ir-generate$(EXEEXT)
        $(AM_V_CCLD)$(g_ir_generate_LINK) $(g_ir_generate_OBJECTS) $(g_ir_generate_LDADD) $(LIBS)
+tools/g_ir_inspect-g-ir-inspect.$(OBJEXT): tools/$(am__dirstamp) \
+       tools/$(DEPDIR)/$(am__dirstamp)
 
 g-ir-inspect$(EXEEXT): $(g_ir_inspect_OBJECTS) $(g_ir_inspect_DEPENDENCIES) $(EXTRA_g_ir_inspect_DEPENDENCIES) 
        @rm -f g-ir-inspect$(EXEEXT)
        $(AM_V_CCLD)$(g_ir_inspect_LINK) $(g_ir_inspect_OBJECTS) $(g_ir_inspect_LDADD) $(LIBS)
+girepository/gi_dump_types-gdump.$(OBJEXT):  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/gi_dump_types-gi-dump-types.$(OBJEXT):  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
 
 gi-dump-types$(EXEEXT): $(gi_dump_types_OBJECTS) $(gi_dump_types_DEPENDENCIES) $(EXTRA_gi_dump_types_DEPENDENCIES) 
        @rm -f gi-dump-types$(EXEEXT)
        $(AM_V_CCLD)$(gi_dump_types_LINK) $(gi_dump_types_OBJECTS) $(gi_dump_types_LDADD) $(LIBS)
+examples/$(am__dirstamp):
+       @$(MKDIR_P) examples
+       @: > examples/$(am__dirstamp)
+examples/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) examples/$(DEPDIR)
+       @: > examples/$(DEPDIR)/$(am__dirstamp)
+examples/glib_print-glib-print.$(OBJEXT): examples/$(am__dirstamp) \
+       examples/$(DEPDIR)/$(am__dirstamp)
 
 glib-print$(EXEEXT): $(glib_print_OBJECTS) $(glib_print_DEPENDENCIES) $(EXTRA_glib_print_DEPENDENCIES) 
        @rm -f glib-print$(EXEEXT)
        $(AM_V_CCLD)$(glib_print_LINK) $(glib_print_OBJECTS) $(glib_print_LDADD) $(LIBS)
+girepository/gthash_test-gthash.$(OBJEXT):  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
+girepository/gthash_test-gthash-test.$(OBJEXT):  \
+       girepository/$(am__dirstamp) \
+       girepository/$(DEPDIR)/$(am__dirstamp)
 
 gthash-test$(EXEEXT): $(gthash_test_OBJECTS) $(gthash_test_DEPENDENCIES) $(EXTRA_gthash_test_DEPENDENCIES) 
        @rm -f gthash-test$(EXEEXT)
@@ -1882,620 +2111,624 @@ uninstall-binSCRIPTS:
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
+       -rm -f examples/*.$(OBJEXT)
+       -rm -f girepository/*.$(OBJEXT)
+       -rm -f girepository/*.lo
+       -rm -f girepository/cmph/*.$(OBJEXT)
+       -rm -f girepository/cmph/*.lo
+       -rm -f giscanner/*.$(OBJEXT)
+       -rm -f giscanner/*.lo
+       -rm -f tools/*.$(OBJEXT)
 
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_giscanner_la-giscannermodule.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_ir_compiler-compiler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_ir_generate-generate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_ir_inspect-g-ir-inspect.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gi_dump_types-gdump.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gi_dump_types-gi-dump-types.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glib_print-glib-print.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthash_test-gthash-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthash_test-gthash.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-bdz.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-bdz_ph.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-bmz.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-bmz8.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-brz.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-buffer_entry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-buffer_manager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-chd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-chd_ph.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-chm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-cmph.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-cmph_structs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-compressed_rank.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-compressed_seq.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-fch.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-fch_buckets.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-graph.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-hash.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-jenkins_hash.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-miller_rabin.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-select.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-vqueue.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmph_la-vstack.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-gdump.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-giarginfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-gibaseinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-gicallableinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-giconstantinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-gienuminfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-gifieldinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-gifunctioninfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-giinterfaceinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-ginvoke.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-giobjectinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-gipropertyinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-giregisteredtypeinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-girepository.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-girffi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-gisignalinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-gistructinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-gitypeinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-gitypelib.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-giunioninfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_1_0_la-givfuncinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_gthash_la-gthash.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_internals_la-girmodule.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_internals_la-girnode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_internals_la-giroffsets.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_internals_la-girparser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgirepository_internals_la-girwriter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiscanner_la-scannerlexer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiscanner_la-scannerparser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiscanner_la-sourcescanner.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/glib_print-glib-print.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/gi_dump_types-gdump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/gi_dump_types-gi-dump-types.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/gthash_test-gthash-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/gthash_test-gthash.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-gdump.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-giarginfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-gibaseinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-gicallableinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-giconstantinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-gienuminfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-gifieldinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-gifunctioninfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-giinterfaceinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-ginvoke.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-giobjectinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-gipropertyinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-giregisteredtypeinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-girepository.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-girffi.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-gisignalinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-gistructinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-gitypeinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-gitypelib.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-giunioninfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_1_0_la-givfuncinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_gthash_la-gthash.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_internals_la-girmodule.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_internals_la-girnode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_internals_la-giroffsets.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_internals_la-girparser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/$(DEPDIR)/libgirepository_internals_la-girwriter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-bdz.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-bdz_ph.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-bmz.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-bmz8.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-brz.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-buffer_entry.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-buffer_manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-chd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-chd_ph.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-chm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-cmph.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-cmph_structs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-compressed_rank.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-compressed_seq.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-fch.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-fch_buckets.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-graph.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-hash.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-jenkins_hash.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-miller_rabin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-select.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-vqueue.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@girepository/cmph/$(DEPDIR)/libcmph_la-vstack.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@giscanner/$(DEPDIR)/_giscanner_la-giscannermodule.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@giscanner/$(DEPDIR)/libgiscanner_la-scannerlexer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@giscanner/$(DEPDIR)/libgiscanner_la-scannerparser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@giscanner/$(DEPDIR)/libgiscanner_la-sourcescanner.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/g_ir_compiler-compiler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/g_ir_generate-generate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/g_ir_inspect-g-ir-inspect.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-_giscanner_la-giscannermodule.lo: giscanner/giscannermodule.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_giscanner_la_CFLAGS) $(CFLAGS) -MT _giscanner_la-giscannermodule.lo -MD -MP -MF $(DEPDIR)/_giscanner_la-giscannermodule.Tpo -c -o _giscanner_la-giscannermodule.lo `test -f 'giscanner/giscannermodule.c' || echo '$(srcdir)/'`giscanner/giscannermodule.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/_giscanner_la-giscannermodule.Tpo $(DEPDIR)/_giscanner_la-giscannermodule.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='giscanner/giscannermodule.c' object='_giscanner_la-giscannermodule.lo' libtool=yes @AMDEPBACKSLASH@
+giscanner/_giscanner_la-giscannermodule.lo: giscanner/giscannermodule.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_giscanner_la_CFLAGS) $(CFLAGS) -MT giscanner/_giscanner_la-giscannermodule.lo -MD -MP -MF giscanner/$(DEPDIR)/_giscanner_la-giscannermodule.Tpo -c -o giscanner/_giscanner_la-giscannermodule.lo `test -f 'giscanner/giscannermodule.c' || echo '$(srcdir)/'`giscanner/giscannermodule.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) giscanner/$(DEPDIR)/_giscanner_la-giscannermodule.Tpo giscanner/$(DEPDIR)/_giscanner_la-giscannermodule.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='giscanner/giscannermodule.c' object='giscanner/_giscanner_la-giscannermodule.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_giscanner_la_CFLAGS) $(CFLAGS) -c -o _giscanner_la-giscannermodule.lo `test -f 'giscanner/giscannermodule.c' || echo '$(srcdir)/'`giscanner/giscannermodule.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_giscanner_la_CFLAGS) $(CFLAGS) -c -o giscanner/_giscanner_la-giscannermodule.lo `test -f 'giscanner/giscannermodule.c' || echo '$(srcdir)/'`giscanner/giscannermodule.c
 
-libcmph_la-bdz.lo: girepository/cmph/bdz.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-bdz.lo -MD -MP -MF $(DEPDIR)/libcmph_la-bdz.Tpo -c -o libcmph_la-bdz.lo `test -f 'girepository/cmph/bdz.c' || echo '$(srcdir)/'`girepository/cmph/bdz.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-bdz.Tpo $(DEPDIR)/libcmph_la-bdz.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/bdz.c' object='libcmph_la-bdz.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-bdz.lo: girepository/cmph/bdz.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-bdz.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-bdz.Tpo -c -o girepository/cmph/libcmph_la-bdz.lo `test -f 'girepository/cmph/bdz.c' || echo '$(srcdir)/'`girepository/cmph/bdz.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-bdz.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-bdz.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/bdz.c' object='girepository/cmph/libcmph_la-bdz.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-bdz.lo `test -f 'girepository/cmph/bdz.c' || echo '$(srcdir)/'`girepository/cmph/bdz.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-bdz.lo `test -f 'girepository/cmph/bdz.c' || echo '$(srcdir)/'`girepository/cmph/bdz.c
 
-libcmph_la-bdz_ph.lo: girepository/cmph/bdz_ph.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-bdz_ph.lo -MD -MP -MF $(DEPDIR)/libcmph_la-bdz_ph.Tpo -c -o libcmph_la-bdz_ph.lo `test -f 'girepository/cmph/bdz_ph.c' || echo '$(srcdir)/'`girepository/cmph/bdz_ph.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-bdz_ph.Tpo $(DEPDIR)/libcmph_la-bdz_ph.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/bdz_ph.c' object='libcmph_la-bdz_ph.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-bdz_ph.lo: girepository/cmph/bdz_ph.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-bdz_ph.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-bdz_ph.Tpo -c -o girepository/cmph/libcmph_la-bdz_ph.lo `test -f 'girepository/cmph/bdz_ph.c' || echo '$(srcdir)/'`girepository/cmph/bdz_ph.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-bdz_ph.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-bdz_ph.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/bdz_ph.c' object='girepository/cmph/libcmph_la-bdz_ph.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-bdz_ph.lo `test -f 'girepository/cmph/bdz_ph.c' || echo '$(srcdir)/'`girepository/cmph/bdz_ph.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-bdz_ph.lo `test -f 'girepository/cmph/bdz_ph.c' || echo '$(srcdir)/'`girepository/cmph/bdz_ph.c
 
-libcmph_la-bmz8.lo: girepository/cmph/bmz8.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-bmz8.lo -MD -MP -MF $(DEPDIR)/libcmph_la-bmz8.Tpo -c -o libcmph_la-bmz8.lo `test -f 'girepository/cmph/bmz8.c' || echo '$(srcdir)/'`girepository/cmph/bmz8.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-bmz8.Tpo $(DEPDIR)/libcmph_la-bmz8.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/bmz8.c' object='libcmph_la-bmz8.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-bmz8.lo: girepository/cmph/bmz8.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-bmz8.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-bmz8.Tpo -c -o girepository/cmph/libcmph_la-bmz8.lo `test -f 'girepository/cmph/bmz8.c' || echo '$(srcdir)/'`girepository/cmph/bmz8.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-bmz8.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-bmz8.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/bmz8.c' object='girepository/cmph/libcmph_la-bmz8.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-bmz8.lo `test -f 'girepository/cmph/bmz8.c' || echo '$(srcdir)/'`girepository/cmph/bmz8.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-bmz8.lo `test -f 'girepository/cmph/bmz8.c' || echo '$(srcdir)/'`girepository/cmph/bmz8.c
 
-libcmph_la-bmz.lo: girepository/cmph/bmz.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-bmz.lo -MD -MP -MF $(DEPDIR)/libcmph_la-bmz.Tpo -c -o libcmph_la-bmz.lo `test -f 'girepository/cmph/bmz.c' || echo '$(srcdir)/'`girepository/cmph/bmz.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-bmz.Tpo $(DEPDIR)/libcmph_la-bmz.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/bmz.c' object='libcmph_la-bmz.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-bmz.lo: girepository/cmph/bmz.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-bmz.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-bmz.Tpo -c -o girepository/cmph/libcmph_la-bmz.lo `test -f 'girepository/cmph/bmz.c' || echo '$(srcdir)/'`girepository/cmph/bmz.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-bmz.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-bmz.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/bmz.c' object='girepository/cmph/libcmph_la-bmz.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-bmz.lo `test -f 'girepository/cmph/bmz.c' || echo '$(srcdir)/'`girepository/cmph/bmz.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-bmz.lo `test -f 'girepository/cmph/bmz.c' || echo '$(srcdir)/'`girepository/cmph/bmz.c
 
-libcmph_la-brz.lo: girepository/cmph/brz.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-brz.lo -MD -MP -MF $(DEPDIR)/libcmph_la-brz.Tpo -c -o libcmph_la-brz.lo `test -f 'girepository/cmph/brz.c' || echo '$(srcdir)/'`girepository/cmph/brz.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-brz.Tpo $(DEPDIR)/libcmph_la-brz.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/brz.c' object='libcmph_la-brz.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-brz.lo: girepository/cmph/brz.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-brz.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-brz.Tpo -c -o girepository/cmph/libcmph_la-brz.lo `test -f 'girepository/cmph/brz.c' || echo '$(srcdir)/'`girepository/cmph/brz.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-brz.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-brz.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/brz.c' object='girepository/cmph/libcmph_la-brz.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-brz.lo `test -f 'girepository/cmph/brz.c' || echo '$(srcdir)/'`girepository/cmph/brz.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-brz.lo `test -f 'girepository/cmph/brz.c' || echo '$(srcdir)/'`girepository/cmph/brz.c
 
-libcmph_la-buffer_entry.lo: girepository/cmph/buffer_entry.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-buffer_entry.lo -MD -MP -MF $(DEPDIR)/libcmph_la-buffer_entry.Tpo -c -o libcmph_la-buffer_entry.lo `test -f 'girepository/cmph/buffer_entry.c' || echo '$(srcdir)/'`girepository/cmph/buffer_entry.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-buffer_entry.Tpo $(DEPDIR)/libcmph_la-buffer_entry.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/buffer_entry.c' object='libcmph_la-buffer_entry.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-buffer_entry.lo: girepository/cmph/buffer_entry.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-buffer_entry.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-buffer_entry.Tpo -c -o girepository/cmph/libcmph_la-buffer_entry.lo `test -f 'girepository/cmph/buffer_entry.c' || echo '$(srcdir)/'`girepository/cmph/buffer_entry.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-buffer_entry.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-buffer_entry.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/buffer_entry.c' object='girepository/cmph/libcmph_la-buffer_entry.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-buffer_entry.lo `test -f 'girepository/cmph/buffer_entry.c' || echo '$(srcdir)/'`girepository/cmph/buffer_entry.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-buffer_entry.lo `test -f 'girepository/cmph/buffer_entry.c' || echo '$(srcdir)/'`girepository/cmph/buffer_entry.c
 
-libcmph_la-buffer_manager.lo: girepository/cmph/buffer_manager.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-buffer_manager.lo -MD -MP -MF $(DEPDIR)/libcmph_la-buffer_manager.Tpo -c -o libcmph_la-buffer_manager.lo `test -f 'girepository/cmph/buffer_manager.c' || echo '$(srcdir)/'`girepository/cmph/buffer_manager.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-buffer_manager.Tpo $(DEPDIR)/libcmph_la-buffer_manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/buffer_manager.c' object='libcmph_la-buffer_manager.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-buffer_manager.lo: girepository/cmph/buffer_manager.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-buffer_manager.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-buffer_manager.Tpo -c -o girepository/cmph/libcmph_la-buffer_manager.lo `test -f 'girepository/cmph/buffer_manager.c' || echo '$(srcdir)/'`girepository/cmph/buffer_manager.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-buffer_manager.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-buffer_manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/buffer_manager.c' object='girepository/cmph/libcmph_la-buffer_manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-buffer_manager.lo `test -f 'girepository/cmph/buffer_manager.c' || echo '$(srcdir)/'`girepository/cmph/buffer_manager.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-buffer_manager.lo `test -f 'girepository/cmph/buffer_manager.c' || echo '$(srcdir)/'`girepository/cmph/buffer_manager.c
 
-libcmph_la-chd.lo: girepository/cmph/chd.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-chd.lo -MD -MP -MF $(DEPDIR)/libcmph_la-chd.Tpo -c -o libcmph_la-chd.lo `test -f 'girepository/cmph/chd.c' || echo '$(srcdir)/'`girepository/cmph/chd.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-chd.Tpo $(DEPDIR)/libcmph_la-chd.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/chd.c' object='libcmph_la-chd.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-chd.lo: girepository/cmph/chd.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-chd.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-chd.Tpo -c -o girepository/cmph/libcmph_la-chd.lo `test -f 'girepository/cmph/chd.c' || echo '$(srcdir)/'`girepository/cmph/chd.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-chd.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-chd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/chd.c' object='girepository/cmph/libcmph_la-chd.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-chd.lo `test -f 'girepository/cmph/chd.c' || echo '$(srcdir)/'`girepository/cmph/chd.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-chd.lo `test -f 'girepository/cmph/chd.c' || echo '$(srcdir)/'`girepository/cmph/chd.c
 
-libcmph_la-chd_ph.lo: girepository/cmph/chd_ph.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-chd_ph.lo -MD -MP -MF $(DEPDIR)/libcmph_la-chd_ph.Tpo -c -o libcmph_la-chd_ph.lo `test -f 'girepository/cmph/chd_ph.c' || echo '$(srcdir)/'`girepository/cmph/chd_ph.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-chd_ph.Tpo $(DEPDIR)/libcmph_la-chd_ph.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/chd_ph.c' object='libcmph_la-chd_ph.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-chd_ph.lo: girepository/cmph/chd_ph.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-chd_ph.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-chd_ph.Tpo -c -o girepository/cmph/libcmph_la-chd_ph.lo `test -f 'girepository/cmph/chd_ph.c' || echo '$(srcdir)/'`girepository/cmph/chd_ph.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-chd_ph.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-chd_ph.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/chd_ph.c' object='girepository/cmph/libcmph_la-chd_ph.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-chd_ph.lo `test -f 'girepository/cmph/chd_ph.c' || echo '$(srcdir)/'`girepository/cmph/chd_ph.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-chd_ph.lo `test -f 'girepository/cmph/chd_ph.c' || echo '$(srcdir)/'`girepository/cmph/chd_ph.c
 
-libcmph_la-chm.lo: girepository/cmph/chm.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-chm.lo -MD -MP -MF $(DEPDIR)/libcmph_la-chm.Tpo -c -o libcmph_la-chm.lo `test -f 'girepository/cmph/chm.c' || echo '$(srcdir)/'`girepository/cmph/chm.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-chm.Tpo $(DEPDIR)/libcmph_la-chm.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/chm.c' object='libcmph_la-chm.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-chm.lo: girepository/cmph/chm.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-chm.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-chm.Tpo -c -o girepository/cmph/libcmph_la-chm.lo `test -f 'girepository/cmph/chm.c' || echo '$(srcdir)/'`girepository/cmph/chm.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-chm.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-chm.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/chm.c' object='girepository/cmph/libcmph_la-chm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-chm.lo `test -f 'girepository/cmph/chm.c' || echo '$(srcdir)/'`girepository/cmph/chm.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-chm.lo `test -f 'girepository/cmph/chm.c' || echo '$(srcdir)/'`girepository/cmph/chm.c
 
-libcmph_la-cmph.lo: girepository/cmph/cmph.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-cmph.lo -MD -MP -MF $(DEPDIR)/libcmph_la-cmph.Tpo -c -o libcmph_la-cmph.lo `test -f 'girepository/cmph/cmph.c' || echo '$(srcdir)/'`girepository/cmph/cmph.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-cmph.Tpo $(DEPDIR)/libcmph_la-cmph.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/cmph.c' object='libcmph_la-cmph.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-cmph.lo: girepository/cmph/cmph.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-cmph.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-cmph.Tpo -c -o girepository/cmph/libcmph_la-cmph.lo `test -f 'girepository/cmph/cmph.c' || echo '$(srcdir)/'`girepository/cmph/cmph.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-cmph.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-cmph.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/cmph.c' object='girepository/cmph/libcmph_la-cmph.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-cmph.lo `test -f 'girepository/cmph/cmph.c' || echo '$(srcdir)/'`girepository/cmph/cmph.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-cmph.lo `test -f 'girepository/cmph/cmph.c' || echo '$(srcdir)/'`girepository/cmph/cmph.c
 
-libcmph_la-cmph_structs.lo: girepository/cmph/cmph_structs.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-cmph_structs.lo -MD -MP -MF $(DEPDIR)/libcmph_la-cmph_structs.Tpo -c -o libcmph_la-cmph_structs.lo `test -f 'girepository/cmph/cmph_structs.c' || echo '$(srcdir)/'`girepository/cmph/cmph_structs.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-cmph_structs.Tpo $(DEPDIR)/libcmph_la-cmph_structs.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/cmph_structs.c' object='libcmph_la-cmph_structs.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-cmph_structs.lo: girepository/cmph/cmph_structs.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-cmph_structs.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-cmph_structs.Tpo -c -o girepository/cmph/libcmph_la-cmph_structs.lo `test -f 'girepository/cmph/cmph_structs.c' || echo '$(srcdir)/'`girepository/cmph/cmph_structs.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-cmph_structs.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-cmph_structs.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/cmph_structs.c' object='girepository/cmph/libcmph_la-cmph_structs.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-cmph_structs.lo `test -f 'girepository/cmph/cmph_structs.c' || echo '$(srcdir)/'`girepository/cmph/cmph_structs.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-cmph_structs.lo `test -f 'girepository/cmph/cmph_structs.c' || echo '$(srcdir)/'`girepository/cmph/cmph_structs.c
 
-libcmph_la-compressed_rank.lo: girepository/cmph/compressed_rank.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-compressed_rank.lo -MD -MP -MF $(DEPDIR)/libcmph_la-compressed_rank.Tpo -c -o libcmph_la-compressed_rank.lo `test -f 'girepository/cmph/compressed_rank.c' || echo '$(srcdir)/'`girepository/cmph/compressed_rank.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-compressed_rank.Tpo $(DEPDIR)/libcmph_la-compressed_rank.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/compressed_rank.c' object='libcmph_la-compressed_rank.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-compressed_rank.lo: girepository/cmph/compressed_rank.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-compressed_rank.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-compressed_rank.Tpo -c -o girepository/cmph/libcmph_la-compressed_rank.lo `test -f 'girepository/cmph/compressed_rank.c' || echo '$(srcdir)/'`girepository/cmph/compressed_rank.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-compressed_rank.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-compressed_rank.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/compressed_rank.c' object='girepository/cmph/libcmph_la-compressed_rank.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-compressed_rank.lo `test -f 'girepository/cmph/compressed_rank.c' || echo '$(srcdir)/'`girepository/cmph/compressed_rank.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-compressed_rank.lo `test -f 'girepository/cmph/compressed_rank.c' || echo '$(srcdir)/'`girepository/cmph/compressed_rank.c
 
-libcmph_la-compressed_seq.lo: girepository/cmph/compressed_seq.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-compressed_seq.lo -MD -MP -MF $(DEPDIR)/libcmph_la-compressed_seq.Tpo -c -o libcmph_la-compressed_seq.lo `test -f 'girepository/cmph/compressed_seq.c' || echo '$(srcdir)/'`girepository/cmph/compressed_seq.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-compressed_seq.Tpo $(DEPDIR)/libcmph_la-compressed_seq.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/compressed_seq.c' object='libcmph_la-compressed_seq.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-compressed_seq.lo: girepository/cmph/compressed_seq.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-compressed_seq.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-compressed_seq.Tpo -c -o girepository/cmph/libcmph_la-compressed_seq.lo `test -f 'girepository/cmph/compressed_seq.c' || echo '$(srcdir)/'`girepository/cmph/compressed_seq.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-compressed_seq.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-compressed_seq.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/compressed_seq.c' object='girepository/cmph/libcmph_la-compressed_seq.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-compressed_seq.lo `test -f 'girepository/cmph/compressed_seq.c' || echo '$(srcdir)/'`girepository/cmph/compressed_seq.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-compressed_seq.lo `test -f 'girepository/cmph/compressed_seq.c' || echo '$(srcdir)/'`girepository/cmph/compressed_seq.c
 
-libcmph_la-fch_buckets.lo: girepository/cmph/fch_buckets.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-fch_buckets.lo -MD -MP -MF $(DEPDIR)/libcmph_la-fch_buckets.Tpo -c -o libcmph_la-fch_buckets.lo `test -f 'girepository/cmph/fch_buckets.c' || echo '$(srcdir)/'`girepository/cmph/fch_buckets.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-fch_buckets.Tpo $(DEPDIR)/libcmph_la-fch_buckets.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/fch_buckets.c' object='libcmph_la-fch_buckets.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-fch_buckets.lo: girepository/cmph/fch_buckets.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-fch_buckets.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-fch_buckets.Tpo -c -o girepository/cmph/libcmph_la-fch_buckets.lo `test -f 'girepository/cmph/fch_buckets.c' || echo '$(srcdir)/'`girepository/cmph/fch_buckets.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-fch_buckets.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-fch_buckets.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/fch_buckets.c' object='girepository/cmph/libcmph_la-fch_buckets.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-fch_buckets.lo `test -f 'girepository/cmph/fch_buckets.c' || echo '$(srcdir)/'`girepository/cmph/fch_buckets.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-fch_buckets.lo `test -f 'girepository/cmph/fch_buckets.c' || echo '$(srcdir)/'`girepository/cmph/fch_buckets.c
 
-libcmph_la-fch.lo: girepository/cmph/fch.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-fch.lo -MD -MP -MF $(DEPDIR)/libcmph_la-fch.Tpo -c -o libcmph_la-fch.lo `test -f 'girepository/cmph/fch.c' || echo '$(srcdir)/'`girepository/cmph/fch.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-fch.Tpo $(DEPDIR)/libcmph_la-fch.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/fch.c' object='libcmph_la-fch.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-fch.lo: girepository/cmph/fch.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-fch.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-fch.Tpo -c -o girepository/cmph/libcmph_la-fch.lo `test -f 'girepository/cmph/fch.c' || echo '$(srcdir)/'`girepository/cmph/fch.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-fch.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-fch.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/fch.c' object='girepository/cmph/libcmph_la-fch.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-fch.lo `test -f 'girepository/cmph/fch.c' || echo '$(srcdir)/'`girepository/cmph/fch.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-fch.lo `test -f 'girepository/cmph/fch.c' || echo '$(srcdir)/'`girepository/cmph/fch.c
 
-libcmph_la-graph.lo: girepository/cmph/graph.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-graph.lo -MD -MP -MF $(DEPDIR)/libcmph_la-graph.Tpo -c -o libcmph_la-graph.lo `test -f 'girepository/cmph/graph.c' || echo '$(srcdir)/'`girepository/cmph/graph.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-graph.Tpo $(DEPDIR)/libcmph_la-graph.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/graph.c' object='libcmph_la-graph.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-graph.lo: girepository/cmph/graph.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-graph.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-graph.Tpo -c -o girepository/cmph/libcmph_la-graph.lo `test -f 'girepository/cmph/graph.c' || echo '$(srcdir)/'`girepository/cmph/graph.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-graph.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-graph.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/graph.c' object='girepository/cmph/libcmph_la-graph.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-graph.lo `test -f 'girepository/cmph/graph.c' || echo '$(srcdir)/'`girepository/cmph/graph.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-graph.lo `test -f 'girepository/cmph/graph.c' || echo '$(srcdir)/'`girepository/cmph/graph.c
 
-libcmph_la-hash.lo: girepository/cmph/hash.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-hash.lo -MD -MP -MF $(DEPDIR)/libcmph_la-hash.Tpo -c -o libcmph_la-hash.lo `test -f 'girepository/cmph/hash.c' || echo '$(srcdir)/'`girepository/cmph/hash.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-hash.Tpo $(DEPDIR)/libcmph_la-hash.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/hash.c' object='libcmph_la-hash.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-hash.lo: girepository/cmph/hash.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-hash.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-hash.Tpo -c -o girepository/cmph/libcmph_la-hash.lo `test -f 'girepository/cmph/hash.c' || echo '$(srcdir)/'`girepository/cmph/hash.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-hash.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-hash.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/hash.c' object='girepository/cmph/libcmph_la-hash.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-hash.lo `test -f 'girepository/cmph/hash.c' || echo '$(srcdir)/'`girepository/cmph/hash.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-hash.lo `test -f 'girepository/cmph/hash.c' || echo '$(srcdir)/'`girepository/cmph/hash.c
 
-libcmph_la-jenkins_hash.lo: girepository/cmph/jenkins_hash.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-jenkins_hash.lo -MD -MP -MF $(DEPDIR)/libcmph_la-jenkins_hash.Tpo -c -o libcmph_la-jenkins_hash.lo `test -f 'girepository/cmph/jenkins_hash.c' || echo '$(srcdir)/'`girepository/cmph/jenkins_hash.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-jenkins_hash.Tpo $(DEPDIR)/libcmph_la-jenkins_hash.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/jenkins_hash.c' object='libcmph_la-jenkins_hash.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-jenkins_hash.lo: girepository/cmph/jenkins_hash.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-jenkins_hash.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-jenkins_hash.Tpo -c -o girepository/cmph/libcmph_la-jenkins_hash.lo `test -f 'girepository/cmph/jenkins_hash.c' || echo '$(srcdir)/'`girepository/cmph/jenkins_hash.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-jenkins_hash.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-jenkins_hash.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/jenkins_hash.c' object='girepository/cmph/libcmph_la-jenkins_hash.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-jenkins_hash.lo `test -f 'girepository/cmph/jenkins_hash.c' || echo '$(srcdir)/'`girepository/cmph/jenkins_hash.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-jenkins_hash.lo `test -f 'girepository/cmph/jenkins_hash.c' || echo '$(srcdir)/'`girepository/cmph/jenkins_hash.c
 
-libcmph_la-miller_rabin.lo: girepository/cmph/miller_rabin.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-miller_rabin.lo -MD -MP -MF $(DEPDIR)/libcmph_la-miller_rabin.Tpo -c -o libcmph_la-miller_rabin.lo `test -f 'girepository/cmph/miller_rabin.c' || echo '$(srcdir)/'`girepository/cmph/miller_rabin.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-miller_rabin.Tpo $(DEPDIR)/libcmph_la-miller_rabin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/miller_rabin.c' object='libcmph_la-miller_rabin.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-miller_rabin.lo: girepository/cmph/miller_rabin.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-miller_rabin.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-miller_rabin.Tpo -c -o girepository/cmph/libcmph_la-miller_rabin.lo `test -f 'girepository/cmph/miller_rabin.c' || echo '$(srcdir)/'`girepository/cmph/miller_rabin.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-miller_rabin.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-miller_rabin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/miller_rabin.c' object='girepository/cmph/libcmph_la-miller_rabin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-miller_rabin.lo `test -f 'girepository/cmph/miller_rabin.c' || echo '$(srcdir)/'`girepository/cmph/miller_rabin.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-miller_rabin.lo `test -f 'girepository/cmph/miller_rabin.c' || echo '$(srcdir)/'`girepository/cmph/miller_rabin.c
 
-libcmph_la-select.lo: girepository/cmph/select.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-select.lo -MD -MP -MF $(DEPDIR)/libcmph_la-select.Tpo -c -o libcmph_la-select.lo `test -f 'girepository/cmph/select.c' || echo '$(srcdir)/'`girepository/cmph/select.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-select.Tpo $(DEPDIR)/libcmph_la-select.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/select.c' object='libcmph_la-select.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-select.lo: girepository/cmph/select.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-select.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-select.Tpo -c -o girepository/cmph/libcmph_la-select.lo `test -f 'girepository/cmph/select.c' || echo '$(srcdir)/'`girepository/cmph/select.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-select.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-select.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/select.c' object='girepository/cmph/libcmph_la-select.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-select.lo `test -f 'girepository/cmph/select.c' || echo '$(srcdir)/'`girepository/cmph/select.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-select.lo `test -f 'girepository/cmph/select.c' || echo '$(srcdir)/'`girepository/cmph/select.c
 
-libcmph_la-vqueue.lo: girepository/cmph/vqueue.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-vqueue.lo -MD -MP -MF $(DEPDIR)/libcmph_la-vqueue.Tpo -c -o libcmph_la-vqueue.lo `test -f 'girepository/cmph/vqueue.c' || echo '$(srcdir)/'`girepository/cmph/vqueue.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-vqueue.Tpo $(DEPDIR)/libcmph_la-vqueue.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/vqueue.c' object='libcmph_la-vqueue.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-vqueue.lo: girepository/cmph/vqueue.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-vqueue.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-vqueue.Tpo -c -o girepository/cmph/libcmph_la-vqueue.lo `test -f 'girepository/cmph/vqueue.c' || echo '$(srcdir)/'`girepository/cmph/vqueue.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-vqueue.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-vqueue.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/vqueue.c' object='girepository/cmph/libcmph_la-vqueue.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-vqueue.lo `test -f 'girepository/cmph/vqueue.c' || echo '$(srcdir)/'`girepository/cmph/vqueue.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-vqueue.lo `test -f 'girepository/cmph/vqueue.c' || echo '$(srcdir)/'`girepository/cmph/vqueue.c
 
-libcmph_la-vstack.lo: girepository/cmph/vstack.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcmph_la-vstack.lo -MD -MP -MF $(DEPDIR)/libcmph_la-vstack.Tpo -c -o libcmph_la-vstack.lo `test -f 'girepository/cmph/vstack.c' || echo '$(srcdir)/'`girepository/cmph/vstack.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcmph_la-vstack.Tpo $(DEPDIR)/libcmph_la-vstack.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/vstack.c' object='libcmph_la-vstack.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/cmph/libcmph_la-vstack.lo: girepository/cmph/vstack.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/cmph/libcmph_la-vstack.lo -MD -MP -MF girepository/cmph/$(DEPDIR)/libcmph_la-vstack.Tpo -c -o girepository/cmph/libcmph_la-vstack.lo `test -f 'girepository/cmph/vstack.c' || echo '$(srcdir)/'`girepository/cmph/vstack.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/cmph/$(DEPDIR)/libcmph_la-vstack.Tpo girepository/cmph/$(DEPDIR)/libcmph_la-vstack.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph/vstack.c' object='girepository/cmph/libcmph_la-vstack.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcmph_la-vstack.lo `test -f 'girepository/cmph/vstack.c' || echo '$(srcdir)/'`girepository/cmph/vstack.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcmph_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/cmph/libcmph_la-vstack.lo `test -f 'girepository/cmph/vstack.c' || echo '$(srcdir)/'`girepository/cmph/vstack.c
 
-libgirepository_1_0_la-gdump.lo: girepository/gdump.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-gdump.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-gdump.Tpo -c -o libgirepository_1_0_la-gdump.lo `test -f 'girepository/gdump.c' || echo '$(srcdir)/'`girepository/gdump.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-gdump.Tpo $(DEPDIR)/libgirepository_1_0_la-gdump.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gdump.c' object='libgirepository_1_0_la-gdump.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-gdump.lo: girepository/gdump.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-gdump.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-gdump.Tpo -c -o girepository/libgirepository_1_0_la-gdump.lo `test -f 'girepository/gdump.c' || echo '$(srcdir)/'`girepository/gdump.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-gdump.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-gdump.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gdump.c' object='girepository/libgirepository_1_0_la-gdump.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-gdump.lo `test -f 'girepository/gdump.c' || echo '$(srcdir)/'`girepository/gdump.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-gdump.lo `test -f 'girepository/gdump.c' || echo '$(srcdir)/'`girepository/gdump.c
 
-libgirepository_1_0_la-giarginfo.lo: girepository/giarginfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-giarginfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-giarginfo.Tpo -c -o libgirepository_1_0_la-giarginfo.lo `test -f 'girepository/giarginfo.c' || echo '$(srcdir)/'`girepository/giarginfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-giarginfo.Tpo $(DEPDIR)/libgirepository_1_0_la-giarginfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/giarginfo.c' object='libgirepository_1_0_la-giarginfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-giarginfo.lo: girepository/giarginfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-giarginfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-giarginfo.Tpo -c -o girepository/libgirepository_1_0_la-giarginfo.lo `test -f 'girepository/giarginfo.c' || echo '$(srcdir)/'`girepository/giarginfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-giarginfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-giarginfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/giarginfo.c' object='girepository/libgirepository_1_0_la-giarginfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-giarginfo.lo `test -f 'girepository/giarginfo.c' || echo '$(srcdir)/'`girepository/giarginfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-giarginfo.lo `test -f 'girepository/giarginfo.c' || echo '$(srcdir)/'`girepository/giarginfo.c
 
-libgirepository_1_0_la-gibaseinfo.lo: girepository/gibaseinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-gibaseinfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-gibaseinfo.Tpo -c -o libgirepository_1_0_la-gibaseinfo.lo `test -f 'girepository/gibaseinfo.c' || echo '$(srcdir)/'`girepository/gibaseinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-gibaseinfo.Tpo $(DEPDIR)/libgirepository_1_0_la-gibaseinfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gibaseinfo.c' object='libgirepository_1_0_la-gibaseinfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-gibaseinfo.lo: girepository/gibaseinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-gibaseinfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-gibaseinfo.Tpo -c -o girepository/libgirepository_1_0_la-gibaseinfo.lo `test -f 'girepository/gibaseinfo.c' || echo '$(srcdir)/'`girepository/gibaseinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-gibaseinfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-gibaseinfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gibaseinfo.c' object='girepository/libgirepository_1_0_la-gibaseinfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-gibaseinfo.lo `test -f 'girepository/gibaseinfo.c' || echo '$(srcdir)/'`girepository/gibaseinfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-gibaseinfo.lo `test -f 'girepository/gibaseinfo.c' || echo '$(srcdir)/'`girepository/gibaseinfo.c
 
-libgirepository_1_0_la-gicallableinfo.lo: girepository/gicallableinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-gicallableinfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-gicallableinfo.Tpo -c -o libgirepository_1_0_la-gicallableinfo.lo `test -f 'girepository/gicallableinfo.c' || echo '$(srcdir)/'`girepository/gicallableinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-gicallableinfo.Tpo $(DEPDIR)/libgirepository_1_0_la-gicallableinfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gicallableinfo.c' object='libgirepository_1_0_la-gicallableinfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-gicallableinfo.lo: girepository/gicallableinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-gicallableinfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-gicallableinfo.Tpo -c -o girepository/libgirepository_1_0_la-gicallableinfo.lo `test -f 'girepository/gicallableinfo.c' || echo '$(srcdir)/'`girepository/gicallableinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-gicallableinfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-gicallableinfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gicallableinfo.c' object='girepository/libgirepository_1_0_la-gicallableinfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-gicallableinfo.lo `test -f 'girepository/gicallableinfo.c' || echo '$(srcdir)/'`girepository/gicallableinfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-gicallableinfo.lo `test -f 'girepository/gicallableinfo.c' || echo '$(srcdir)/'`girepository/gicallableinfo.c
 
-libgirepository_1_0_la-giconstantinfo.lo: girepository/giconstantinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-giconstantinfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-giconstantinfo.Tpo -c -o libgirepository_1_0_la-giconstantinfo.lo `test -f 'girepository/giconstantinfo.c' || echo '$(srcdir)/'`girepository/giconstantinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-giconstantinfo.Tpo $(DEPDIR)/libgirepository_1_0_la-giconstantinfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/giconstantinfo.c' object='libgirepository_1_0_la-giconstantinfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-giconstantinfo.lo: girepository/giconstantinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-giconstantinfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-giconstantinfo.Tpo -c -o girepository/libgirepository_1_0_la-giconstantinfo.lo `test -f 'girepository/giconstantinfo.c' || echo '$(srcdir)/'`girepository/giconstantinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-giconstantinfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-giconstantinfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/giconstantinfo.c' object='girepository/libgirepository_1_0_la-giconstantinfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-giconstantinfo.lo `test -f 'girepository/giconstantinfo.c' || echo '$(srcdir)/'`girepository/giconstantinfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-giconstantinfo.lo `test -f 'girepository/giconstantinfo.c' || echo '$(srcdir)/'`girepository/giconstantinfo.c
 
-libgirepository_1_0_la-gienuminfo.lo: girepository/gienuminfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-gienuminfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-gienuminfo.Tpo -c -o libgirepository_1_0_la-gienuminfo.lo `test -f 'girepository/gienuminfo.c' || echo '$(srcdir)/'`girepository/gienuminfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-gienuminfo.Tpo $(DEPDIR)/libgirepository_1_0_la-gienuminfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gienuminfo.c' object='libgirepository_1_0_la-gienuminfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-gienuminfo.lo: girepository/gienuminfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-gienuminfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-gienuminfo.Tpo -c -o girepository/libgirepository_1_0_la-gienuminfo.lo `test -f 'girepository/gienuminfo.c' || echo '$(srcdir)/'`girepository/gienuminfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-gienuminfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-gienuminfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gienuminfo.c' object='girepository/libgirepository_1_0_la-gienuminfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-gienuminfo.lo `test -f 'girepository/gienuminfo.c' || echo '$(srcdir)/'`girepository/gienuminfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-gienuminfo.lo `test -f 'girepository/gienuminfo.c' || echo '$(srcdir)/'`girepository/gienuminfo.c
 
-libgirepository_1_0_la-gifieldinfo.lo: girepository/gifieldinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-gifieldinfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-gifieldinfo.Tpo -c -o libgirepository_1_0_la-gifieldinfo.lo `test -f 'girepository/gifieldinfo.c' || echo '$(srcdir)/'`girepository/gifieldinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-gifieldinfo.Tpo $(DEPDIR)/libgirepository_1_0_la-gifieldinfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gifieldinfo.c' object='libgirepository_1_0_la-gifieldinfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-gifieldinfo.lo: girepository/gifieldinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-gifieldinfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-gifieldinfo.Tpo -c -o girepository/libgirepository_1_0_la-gifieldinfo.lo `test -f 'girepository/gifieldinfo.c' || echo '$(srcdir)/'`girepository/gifieldinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-gifieldinfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-gifieldinfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gifieldinfo.c' object='girepository/libgirepository_1_0_la-gifieldinfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-gifieldinfo.lo `test -f 'girepository/gifieldinfo.c' || echo '$(srcdir)/'`girepository/gifieldinfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-gifieldinfo.lo `test -f 'girepository/gifieldinfo.c' || echo '$(srcdir)/'`girepository/gifieldinfo.c
 
-libgirepository_1_0_la-gifunctioninfo.lo: girepository/gifunctioninfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-gifunctioninfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-gifunctioninfo.Tpo -c -o libgirepository_1_0_la-gifunctioninfo.lo `test -f 'girepository/gifunctioninfo.c' || echo '$(srcdir)/'`girepository/gifunctioninfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-gifunctioninfo.Tpo $(DEPDIR)/libgirepository_1_0_la-gifunctioninfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gifunctioninfo.c' object='libgirepository_1_0_la-gifunctioninfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-gifunctioninfo.lo: girepository/gifunctioninfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-gifunctioninfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-gifunctioninfo.Tpo -c -o girepository/libgirepository_1_0_la-gifunctioninfo.lo `test -f 'girepository/gifunctioninfo.c' || echo '$(srcdir)/'`girepository/gifunctioninfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-gifunctioninfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-gifunctioninfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gifunctioninfo.c' object='girepository/libgirepository_1_0_la-gifunctioninfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-gifunctioninfo.lo `test -f 'girepository/gifunctioninfo.c' || echo '$(srcdir)/'`girepository/gifunctioninfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-gifunctioninfo.lo `test -f 'girepository/gifunctioninfo.c' || echo '$(srcdir)/'`girepository/gifunctioninfo.c
 
-libgirepository_1_0_la-ginvoke.lo: girepository/ginvoke.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-ginvoke.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-ginvoke.Tpo -c -o libgirepository_1_0_la-ginvoke.lo `test -f 'girepository/ginvoke.c' || echo '$(srcdir)/'`girepository/ginvoke.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-ginvoke.Tpo $(DEPDIR)/libgirepository_1_0_la-ginvoke.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/ginvoke.c' object='libgirepository_1_0_la-ginvoke.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-ginvoke.lo: girepository/ginvoke.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-ginvoke.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-ginvoke.Tpo -c -o girepository/libgirepository_1_0_la-ginvoke.lo `test -f 'girepository/ginvoke.c' || echo '$(srcdir)/'`girepository/ginvoke.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-ginvoke.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-ginvoke.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/ginvoke.c' object='girepository/libgirepository_1_0_la-ginvoke.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-ginvoke.lo `test -f 'girepository/ginvoke.c' || echo '$(srcdir)/'`girepository/ginvoke.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-ginvoke.lo `test -f 'girepository/ginvoke.c' || echo '$(srcdir)/'`girepository/ginvoke.c
 
-libgirepository_1_0_la-giinterfaceinfo.lo: girepository/giinterfaceinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-giinterfaceinfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-giinterfaceinfo.Tpo -c -o libgirepository_1_0_la-giinterfaceinfo.lo `test -f 'girepository/giinterfaceinfo.c' || echo '$(srcdir)/'`girepository/giinterfaceinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-giinterfaceinfo.Tpo $(DEPDIR)/libgirepository_1_0_la-giinterfaceinfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/giinterfaceinfo.c' object='libgirepository_1_0_la-giinterfaceinfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-giinterfaceinfo.lo: girepository/giinterfaceinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-giinterfaceinfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-giinterfaceinfo.Tpo -c -o girepository/libgirepository_1_0_la-giinterfaceinfo.lo `test -f 'girepository/giinterfaceinfo.c' || echo '$(srcdir)/'`girepository/giinterfaceinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-giinterfaceinfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-giinterfaceinfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/giinterfaceinfo.c' object='girepository/libgirepository_1_0_la-giinterfaceinfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-giinterfaceinfo.lo `test -f 'girepository/giinterfaceinfo.c' || echo '$(srcdir)/'`girepository/giinterfaceinfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-giinterfaceinfo.lo `test -f 'girepository/giinterfaceinfo.c' || echo '$(srcdir)/'`girepository/giinterfaceinfo.c
 
-libgirepository_1_0_la-giobjectinfo.lo: girepository/giobjectinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-giobjectinfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-giobjectinfo.Tpo -c -o libgirepository_1_0_la-giobjectinfo.lo `test -f 'girepository/giobjectinfo.c' || echo '$(srcdir)/'`girepository/giobjectinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-giobjectinfo.Tpo $(DEPDIR)/libgirepository_1_0_la-giobjectinfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/giobjectinfo.c' object='libgirepository_1_0_la-giobjectinfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-giobjectinfo.lo: girepository/giobjectinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-giobjectinfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-giobjectinfo.Tpo -c -o girepository/libgirepository_1_0_la-giobjectinfo.lo `test -f 'girepository/giobjectinfo.c' || echo '$(srcdir)/'`girepository/giobjectinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-giobjectinfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-giobjectinfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/giobjectinfo.c' object='girepository/libgirepository_1_0_la-giobjectinfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-giobjectinfo.lo `test -f 'girepository/giobjectinfo.c' || echo '$(srcdir)/'`girepository/giobjectinfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-giobjectinfo.lo `test -f 'girepository/giobjectinfo.c' || echo '$(srcdir)/'`girepository/giobjectinfo.c
 
-libgirepository_1_0_la-gipropertyinfo.lo: girepository/gipropertyinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-gipropertyinfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-gipropertyinfo.Tpo -c -o libgirepository_1_0_la-gipropertyinfo.lo `test -f 'girepository/gipropertyinfo.c' || echo '$(srcdir)/'`girepository/gipropertyinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-gipropertyinfo.Tpo $(DEPDIR)/libgirepository_1_0_la-gipropertyinfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gipropertyinfo.c' object='libgirepository_1_0_la-gipropertyinfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-gipropertyinfo.lo: girepository/gipropertyinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-gipropertyinfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-gipropertyinfo.Tpo -c -o girepository/libgirepository_1_0_la-gipropertyinfo.lo `test -f 'girepository/gipropertyinfo.c' || echo '$(srcdir)/'`girepository/gipropertyinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-gipropertyinfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-gipropertyinfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gipropertyinfo.c' object='girepository/libgirepository_1_0_la-gipropertyinfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-gipropertyinfo.lo `test -f 'girepository/gipropertyinfo.c' || echo '$(srcdir)/'`girepository/gipropertyinfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-gipropertyinfo.lo `test -f 'girepository/gipropertyinfo.c' || echo '$(srcdir)/'`girepository/gipropertyinfo.c
 
-libgirepository_1_0_la-giregisteredtypeinfo.lo: girepository/giregisteredtypeinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-giregisteredtypeinfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-giregisteredtypeinfo.Tpo -c -o libgirepository_1_0_la-giregisteredtypeinfo.lo `test -f 'girepository/giregisteredtypeinfo.c' || echo '$(srcdir)/'`girepository/giregisteredtypeinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-giregisteredtypeinfo.Tpo $(DEPDIR)/libgirepository_1_0_la-giregisteredtypeinfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/giregisteredtypeinfo.c' object='libgirepository_1_0_la-giregisteredtypeinfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-giregisteredtypeinfo.lo: girepository/giregisteredtypeinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-giregisteredtypeinfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-giregisteredtypeinfo.Tpo -c -o girepository/libgirepository_1_0_la-giregisteredtypeinfo.lo `test -f 'girepository/giregisteredtypeinfo.c' || echo '$(srcdir)/'`girepository/giregisteredtypeinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-giregisteredtypeinfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-giregisteredtypeinfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/giregisteredtypeinfo.c' object='girepository/libgirepository_1_0_la-giregisteredtypeinfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-giregisteredtypeinfo.lo `test -f 'girepository/giregisteredtypeinfo.c' || echo '$(srcdir)/'`girepository/giregisteredtypeinfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-giregisteredtypeinfo.lo `test -f 'girepository/giregisteredtypeinfo.c' || echo '$(srcdir)/'`girepository/giregisteredtypeinfo.c
 
-libgirepository_1_0_la-girepository.lo: girepository/girepository.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-girepository.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-girepository.Tpo -c -o libgirepository_1_0_la-girepository.lo `test -f 'girepository/girepository.c' || echo '$(srcdir)/'`girepository/girepository.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-girepository.Tpo $(DEPDIR)/libgirepository_1_0_la-girepository.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/girepository.c' object='libgirepository_1_0_la-girepository.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-girepository.lo: girepository/girepository.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-girepository.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-girepository.Tpo -c -o girepository/libgirepository_1_0_la-girepository.lo `test -f 'girepository/girepository.c' || echo '$(srcdir)/'`girepository/girepository.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-girepository.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-girepository.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/girepository.c' object='girepository/libgirepository_1_0_la-girepository.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-girepository.lo `test -f 'girepository/girepository.c' || echo '$(srcdir)/'`girepository/girepository.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-girepository.lo `test -f 'girepository/girepository.c' || echo '$(srcdir)/'`girepository/girepository.c
 
-libgirepository_1_0_la-girffi.lo: girepository/girffi.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-girffi.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-girffi.Tpo -c -o libgirepository_1_0_la-girffi.lo `test -f 'girepository/girffi.c' || echo '$(srcdir)/'`girepository/girffi.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-girffi.Tpo $(DEPDIR)/libgirepository_1_0_la-girffi.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/girffi.c' object='libgirepository_1_0_la-girffi.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-girffi.lo: girepository/girffi.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-girffi.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-girffi.Tpo -c -o girepository/libgirepository_1_0_la-girffi.lo `test -f 'girepository/girffi.c' || echo '$(srcdir)/'`girepository/girffi.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-girffi.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-girffi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/girffi.c' object='girepository/libgirepository_1_0_la-girffi.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-girffi.lo `test -f 'girepository/girffi.c' || echo '$(srcdir)/'`girepository/girffi.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-girffi.lo `test -f 'girepository/girffi.c' || echo '$(srcdir)/'`girepository/girffi.c
 
-libgirepository_1_0_la-gisignalinfo.lo: girepository/gisignalinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-gisignalinfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-gisignalinfo.Tpo -c -o libgirepository_1_0_la-gisignalinfo.lo `test -f 'girepository/gisignalinfo.c' || echo '$(srcdir)/'`girepository/gisignalinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-gisignalinfo.Tpo $(DEPDIR)/libgirepository_1_0_la-gisignalinfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gisignalinfo.c' object='libgirepository_1_0_la-gisignalinfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-gisignalinfo.lo: girepository/gisignalinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-gisignalinfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-gisignalinfo.Tpo -c -o girepository/libgirepository_1_0_la-gisignalinfo.lo `test -f 'girepository/gisignalinfo.c' || echo '$(srcdir)/'`girepository/gisignalinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-gisignalinfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-gisignalinfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gisignalinfo.c' object='girepository/libgirepository_1_0_la-gisignalinfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-gisignalinfo.lo `test -f 'girepository/gisignalinfo.c' || echo '$(srcdir)/'`girepository/gisignalinfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-gisignalinfo.lo `test -f 'girepository/gisignalinfo.c' || echo '$(srcdir)/'`girepository/gisignalinfo.c
 
-libgirepository_1_0_la-gistructinfo.lo: girepository/gistructinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-gistructinfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-gistructinfo.Tpo -c -o libgirepository_1_0_la-gistructinfo.lo `test -f 'girepository/gistructinfo.c' || echo '$(srcdir)/'`girepository/gistructinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-gistructinfo.Tpo $(DEPDIR)/libgirepository_1_0_la-gistructinfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gistructinfo.c' object='libgirepository_1_0_la-gistructinfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-gistructinfo.lo: girepository/gistructinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-gistructinfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-gistructinfo.Tpo -c -o girepository/libgirepository_1_0_la-gistructinfo.lo `test -f 'girepository/gistructinfo.c' || echo '$(srcdir)/'`girepository/gistructinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-gistructinfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-gistructinfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gistructinfo.c' object='girepository/libgirepository_1_0_la-gistructinfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-gistructinfo.lo `test -f 'girepository/gistructinfo.c' || echo '$(srcdir)/'`girepository/gistructinfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-gistructinfo.lo `test -f 'girepository/gistructinfo.c' || echo '$(srcdir)/'`girepository/gistructinfo.c
 
-libgirepository_1_0_la-gitypeinfo.lo: girepository/gitypeinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-gitypeinfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-gitypeinfo.Tpo -c -o libgirepository_1_0_la-gitypeinfo.lo `test -f 'girepository/gitypeinfo.c' || echo '$(srcdir)/'`girepository/gitypeinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-gitypeinfo.Tpo $(DEPDIR)/libgirepository_1_0_la-gitypeinfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gitypeinfo.c' object='libgirepository_1_0_la-gitypeinfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-gitypeinfo.lo: girepository/gitypeinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-gitypeinfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-gitypeinfo.Tpo -c -o girepository/libgirepository_1_0_la-gitypeinfo.lo `test -f 'girepository/gitypeinfo.c' || echo '$(srcdir)/'`girepository/gitypeinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-gitypeinfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-gitypeinfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gitypeinfo.c' object='girepository/libgirepository_1_0_la-gitypeinfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-gitypeinfo.lo `test -f 'girepository/gitypeinfo.c' || echo '$(srcdir)/'`girepository/gitypeinfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-gitypeinfo.lo `test -f 'girepository/gitypeinfo.c' || echo '$(srcdir)/'`girepository/gitypeinfo.c
 
-libgirepository_1_0_la-gitypelib.lo: girepository/gitypelib.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-gitypelib.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-gitypelib.Tpo -c -o libgirepository_1_0_la-gitypelib.lo `test -f 'girepository/gitypelib.c' || echo '$(srcdir)/'`girepository/gitypelib.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-gitypelib.Tpo $(DEPDIR)/libgirepository_1_0_la-gitypelib.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gitypelib.c' object='libgirepository_1_0_la-gitypelib.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-gitypelib.lo: girepository/gitypelib.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-gitypelib.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-gitypelib.Tpo -c -o girepository/libgirepository_1_0_la-gitypelib.lo `test -f 'girepository/gitypelib.c' || echo '$(srcdir)/'`girepository/gitypelib.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-gitypelib.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-gitypelib.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gitypelib.c' object='girepository/libgirepository_1_0_la-gitypelib.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-gitypelib.lo `test -f 'girepository/gitypelib.c' || echo '$(srcdir)/'`girepository/gitypelib.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-gitypelib.lo `test -f 'girepository/gitypelib.c' || echo '$(srcdir)/'`girepository/gitypelib.c
 
-libgirepository_1_0_la-giunioninfo.lo: girepository/giunioninfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-giunioninfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-giunioninfo.Tpo -c -o libgirepository_1_0_la-giunioninfo.lo `test -f 'girepository/giunioninfo.c' || echo '$(srcdir)/'`girepository/giunioninfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-giunioninfo.Tpo $(DEPDIR)/libgirepository_1_0_la-giunioninfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/giunioninfo.c' object='libgirepository_1_0_la-giunioninfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-giunioninfo.lo: girepository/giunioninfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-giunioninfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-giunioninfo.Tpo -c -o girepository/libgirepository_1_0_la-giunioninfo.lo `test -f 'girepository/giunioninfo.c' || echo '$(srcdir)/'`girepository/giunioninfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-giunioninfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-giunioninfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/giunioninfo.c' object='girepository/libgirepository_1_0_la-giunioninfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-giunioninfo.lo `test -f 'girepository/giunioninfo.c' || echo '$(srcdir)/'`girepository/giunioninfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-giunioninfo.lo `test -f 'girepository/giunioninfo.c' || echo '$(srcdir)/'`girepository/giunioninfo.c
 
-libgirepository_1_0_la-givfuncinfo.lo: girepository/givfuncinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgirepository_1_0_la-givfuncinfo.lo -MD -MP -MF $(DEPDIR)/libgirepository_1_0_la-givfuncinfo.Tpo -c -o libgirepository_1_0_la-givfuncinfo.lo `test -f 'girepository/givfuncinfo.c' || echo '$(srcdir)/'`girepository/givfuncinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_1_0_la-givfuncinfo.Tpo $(DEPDIR)/libgirepository_1_0_la-givfuncinfo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/givfuncinfo.c' object='libgirepository_1_0_la-givfuncinfo.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_1_0_la-givfuncinfo.lo: girepository/givfuncinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_1_0_la-givfuncinfo.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_1_0_la-givfuncinfo.Tpo -c -o girepository/libgirepository_1_0_la-givfuncinfo.lo `test -f 'girepository/givfuncinfo.c' || echo '$(srcdir)/'`girepository/givfuncinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_1_0_la-givfuncinfo.Tpo girepository/$(DEPDIR)/libgirepository_1_0_la-givfuncinfo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/givfuncinfo.c' object='girepository/libgirepository_1_0_la-givfuncinfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgirepository_1_0_la-givfuncinfo.lo `test -f 'girepository/givfuncinfo.c' || echo '$(srcdir)/'`girepository/givfuncinfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgirepository_1_0_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_1_0_la-givfuncinfo.lo `test -f 'girepository/givfuncinfo.c' || echo '$(srcdir)/'`girepository/givfuncinfo.c
 
-libgirepository_gthash_la-gthash.lo: girepository/gthash.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_gthash_la_CFLAGS) $(CFLAGS) -MT libgirepository_gthash_la-gthash.lo -MD -MP -MF $(DEPDIR)/libgirepository_gthash_la-gthash.Tpo -c -o libgirepository_gthash_la-gthash.lo `test -f 'girepository/gthash.c' || echo '$(srcdir)/'`girepository/gthash.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_gthash_la-gthash.Tpo $(DEPDIR)/libgirepository_gthash_la-gthash.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gthash.c' object='libgirepository_gthash_la-gthash.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_gthash_la-gthash.lo: girepository/gthash.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_gthash_la_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_gthash_la-gthash.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_gthash_la-gthash.Tpo -c -o girepository/libgirepository_gthash_la-gthash.lo `test -f 'girepository/gthash.c' || echo '$(srcdir)/'`girepository/gthash.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_gthash_la-gthash.Tpo girepository/$(DEPDIR)/libgirepository_gthash_la-gthash.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gthash.c' object='girepository/libgirepository_gthash_la-gthash.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_gthash_la_CFLAGS) $(CFLAGS) -c -o libgirepository_gthash_la-gthash.lo `test -f 'girepository/gthash.c' || echo '$(srcdir)/'`girepository/gthash.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_gthash_la_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_gthash_la-gthash.lo `test -f 'girepository/gthash.c' || echo '$(srcdir)/'`girepository/gthash.c
 
-libgirepository_internals_la-girmodule.lo: girepository/girmodule.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -MT libgirepository_internals_la-girmodule.lo -MD -MP -MF $(DEPDIR)/libgirepository_internals_la-girmodule.Tpo -c -o libgirepository_internals_la-girmodule.lo `test -f 'girepository/girmodule.c' || echo '$(srcdir)/'`girepository/girmodule.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_internals_la-girmodule.Tpo $(DEPDIR)/libgirepository_internals_la-girmodule.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/girmodule.c' object='libgirepository_internals_la-girmodule.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_internals_la-girmodule.lo: girepository/girmodule.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_internals_la-girmodule.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_internals_la-girmodule.Tpo -c -o girepository/libgirepository_internals_la-girmodule.lo `test -f 'girepository/girmodule.c' || echo '$(srcdir)/'`girepository/girmodule.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_internals_la-girmodule.Tpo girepository/$(DEPDIR)/libgirepository_internals_la-girmodule.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/girmodule.c' object='girepository/libgirepository_internals_la-girmodule.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -c -o libgirepository_internals_la-girmodule.lo `test -f 'girepository/girmodule.c' || echo '$(srcdir)/'`girepository/girmodule.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_internals_la-girmodule.lo `test -f 'girepository/girmodule.c' || echo '$(srcdir)/'`girepository/girmodule.c
 
-libgirepository_internals_la-girnode.lo: girepository/girnode.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -MT libgirepository_internals_la-girnode.lo -MD -MP -MF $(DEPDIR)/libgirepository_internals_la-girnode.Tpo -c -o libgirepository_internals_la-girnode.lo `test -f 'girepository/girnode.c' || echo '$(srcdir)/'`girepository/girnode.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_internals_la-girnode.Tpo $(DEPDIR)/libgirepository_internals_la-girnode.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/girnode.c' object='libgirepository_internals_la-girnode.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_internals_la-girnode.lo: girepository/girnode.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_internals_la-girnode.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_internals_la-girnode.Tpo -c -o girepository/libgirepository_internals_la-girnode.lo `test -f 'girepository/girnode.c' || echo '$(srcdir)/'`girepository/girnode.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_internals_la-girnode.Tpo girepository/$(DEPDIR)/libgirepository_internals_la-girnode.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/girnode.c' object='girepository/libgirepository_internals_la-girnode.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -c -o libgirepository_internals_la-girnode.lo `test -f 'girepository/girnode.c' || echo '$(srcdir)/'`girepository/girnode.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_internals_la-girnode.lo `test -f 'girepository/girnode.c' || echo '$(srcdir)/'`girepository/girnode.c
 
-libgirepository_internals_la-giroffsets.lo: girepository/giroffsets.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -MT libgirepository_internals_la-giroffsets.lo -MD -MP -MF $(DEPDIR)/libgirepository_internals_la-giroffsets.Tpo -c -o libgirepository_internals_la-giroffsets.lo `test -f 'girepository/giroffsets.c' || echo '$(srcdir)/'`girepository/giroffsets.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_internals_la-giroffsets.Tpo $(DEPDIR)/libgirepository_internals_la-giroffsets.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/giroffsets.c' object='libgirepository_internals_la-giroffsets.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_internals_la-giroffsets.lo: girepository/giroffsets.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_internals_la-giroffsets.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_internals_la-giroffsets.Tpo -c -o girepository/libgirepository_internals_la-giroffsets.lo `test -f 'girepository/giroffsets.c' || echo '$(srcdir)/'`girepository/giroffsets.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_internals_la-giroffsets.Tpo girepository/$(DEPDIR)/libgirepository_internals_la-giroffsets.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/giroffsets.c' object='girepository/libgirepository_internals_la-giroffsets.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -c -o libgirepository_internals_la-giroffsets.lo `test -f 'girepository/giroffsets.c' || echo '$(srcdir)/'`girepository/giroffsets.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_internals_la-giroffsets.lo `test -f 'girepository/giroffsets.c' || echo '$(srcdir)/'`girepository/giroffsets.c
 
-libgirepository_internals_la-girparser.lo: girepository/girparser.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -MT libgirepository_internals_la-girparser.lo -MD -MP -MF $(DEPDIR)/libgirepository_internals_la-girparser.Tpo -c -o libgirepository_internals_la-girparser.lo `test -f 'girepository/girparser.c' || echo '$(srcdir)/'`girepository/girparser.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_internals_la-girparser.Tpo $(DEPDIR)/libgirepository_internals_la-girparser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/girparser.c' object='libgirepository_internals_la-girparser.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_internals_la-girparser.lo: girepository/girparser.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_internals_la-girparser.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_internals_la-girparser.Tpo -c -o girepository/libgirepository_internals_la-girparser.lo `test -f 'girepository/girparser.c' || echo '$(srcdir)/'`girepository/girparser.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_internals_la-girparser.Tpo girepository/$(DEPDIR)/libgirepository_internals_la-girparser.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/girparser.c' object='girepository/libgirepository_internals_la-girparser.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -c -o libgirepository_internals_la-girparser.lo `test -f 'girepository/girparser.c' || echo '$(srcdir)/'`girepository/girparser.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_internals_la-girparser.lo `test -f 'girepository/girparser.c' || echo '$(srcdir)/'`girepository/girparser.c
 
-libgirepository_internals_la-girwriter.lo: girepository/girwriter.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -MT libgirepository_internals_la-girwriter.lo -MD -MP -MF $(DEPDIR)/libgirepository_internals_la-girwriter.Tpo -c -o libgirepository_internals_la-girwriter.lo `test -f 'girepository/girwriter.c' || echo '$(srcdir)/'`girepository/girwriter.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgirepository_internals_la-girwriter.Tpo $(DEPDIR)/libgirepository_internals_la-girwriter.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/girwriter.c' object='libgirepository_internals_la-girwriter.lo' libtool=yes @AMDEPBACKSLASH@
+girepository/libgirepository_internals_la-girwriter.lo: girepository/girwriter.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -MT girepository/libgirepository_internals_la-girwriter.lo -MD -MP -MF girepository/$(DEPDIR)/libgirepository_internals_la-girwriter.Tpo -c -o girepository/libgirepository_internals_la-girwriter.lo `test -f 'girepository/girwriter.c' || echo '$(srcdir)/'`girepository/girwriter.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/libgirepository_internals_la-girwriter.Tpo girepository/$(DEPDIR)/libgirepository_internals_la-girwriter.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/girwriter.c' object='girepository/libgirepository_internals_la-girwriter.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -c -o libgirepository_internals_la-girwriter.lo `test -f 'girepository/girwriter.c' || echo '$(srcdir)/'`girepository/girwriter.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgirepository_internals_la_CFLAGS) $(CFLAGS) -c -o girepository/libgirepository_internals_la-girwriter.lo `test -f 'girepository/girwriter.c' || echo '$(srcdir)/'`girepository/girwriter.c
 
-libgiscanner_la-sourcescanner.lo: giscanner/sourcescanner.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiscanner_la_CPPFLAGS) $(CPPFLAGS) $(libgiscanner_la_CFLAGS) $(CFLAGS) -MT libgiscanner_la-sourcescanner.lo -MD -MP -MF $(DEPDIR)/libgiscanner_la-sourcescanner.Tpo -c -o libgiscanner_la-sourcescanner.lo `test -f 'giscanner/sourcescanner.c' || echo '$(srcdir)/'`giscanner/sourcescanner.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgiscanner_la-sourcescanner.Tpo $(DEPDIR)/libgiscanner_la-sourcescanner.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='giscanner/sourcescanner.c' object='libgiscanner_la-sourcescanner.lo' libtool=yes @AMDEPBACKSLASH@
+giscanner/libgiscanner_la-sourcescanner.lo: giscanner/sourcescanner.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiscanner_la_CPPFLAGS) $(CPPFLAGS) $(libgiscanner_la_CFLAGS) $(CFLAGS) -MT giscanner/libgiscanner_la-sourcescanner.lo -MD -MP -MF giscanner/$(DEPDIR)/libgiscanner_la-sourcescanner.Tpo -c -o giscanner/libgiscanner_la-sourcescanner.lo `test -f 'giscanner/sourcescanner.c' || echo '$(srcdir)/'`giscanner/sourcescanner.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) giscanner/$(DEPDIR)/libgiscanner_la-sourcescanner.Tpo giscanner/$(DEPDIR)/libgiscanner_la-sourcescanner.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='giscanner/sourcescanner.c' object='giscanner/libgiscanner_la-sourcescanner.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiscanner_la_CPPFLAGS) $(CPPFLAGS) $(libgiscanner_la_CFLAGS) $(CFLAGS) -c -o libgiscanner_la-sourcescanner.lo `test -f 'giscanner/sourcescanner.c' || echo '$(srcdir)/'`giscanner/sourcescanner.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiscanner_la_CPPFLAGS) $(CPPFLAGS) $(libgiscanner_la_CFLAGS) $(CFLAGS) -c -o giscanner/libgiscanner_la-sourcescanner.lo `test -f 'giscanner/sourcescanner.c' || echo '$(srcdir)/'`giscanner/sourcescanner.c
 
-libgiscanner_la-scannerlexer.lo: scannerlexer.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiscanner_la_CPPFLAGS) $(CPPFLAGS) $(libgiscanner_la_CFLAGS) $(CFLAGS) -MT libgiscanner_la-scannerlexer.lo -MD -MP -MF $(DEPDIR)/libgiscanner_la-scannerlexer.Tpo -c -o libgiscanner_la-scannerlexer.lo `test -f 'scannerlexer.c' || echo '$(srcdir)/'`scannerlexer.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgiscanner_la-scannerlexer.Tpo $(DEPDIR)/libgiscanner_la-scannerlexer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='scannerlexer.c' object='libgiscanner_la-scannerlexer.lo' libtool=yes @AMDEPBACKSLASH@
+giscanner/libgiscanner_la-scannerlexer.lo: giscanner/scannerlexer.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiscanner_la_CPPFLAGS) $(CPPFLAGS) $(libgiscanner_la_CFLAGS) $(CFLAGS) -MT giscanner/libgiscanner_la-scannerlexer.lo -MD -MP -MF giscanner/$(DEPDIR)/libgiscanner_la-scannerlexer.Tpo -c -o giscanner/libgiscanner_la-scannerlexer.lo `test -f 'giscanner/scannerlexer.c' || echo '$(srcdir)/'`giscanner/scannerlexer.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) giscanner/$(DEPDIR)/libgiscanner_la-scannerlexer.Tpo giscanner/$(DEPDIR)/libgiscanner_la-scannerlexer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='giscanner/scannerlexer.c' object='giscanner/libgiscanner_la-scannerlexer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiscanner_la_CPPFLAGS) $(CPPFLAGS) $(libgiscanner_la_CFLAGS) $(CFLAGS) -c -o libgiscanner_la-scannerlexer.lo `test -f 'scannerlexer.c' || echo '$(srcdir)/'`scannerlexer.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiscanner_la_CPPFLAGS) $(CPPFLAGS) $(libgiscanner_la_CFLAGS) $(CFLAGS) -c -o giscanner/libgiscanner_la-scannerlexer.lo `test -f 'giscanner/scannerlexer.c' || echo '$(srcdir)/'`giscanner/scannerlexer.c
 
-libgiscanner_la-scannerparser.lo: scannerparser.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiscanner_la_CPPFLAGS) $(CPPFLAGS) $(libgiscanner_la_CFLAGS) $(CFLAGS) -MT libgiscanner_la-scannerparser.lo -MD -MP -MF $(DEPDIR)/libgiscanner_la-scannerparser.Tpo -c -o libgiscanner_la-scannerparser.lo `test -f 'scannerparser.c' || echo '$(srcdir)/'`scannerparser.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libgiscanner_la-scannerparser.Tpo $(DEPDIR)/libgiscanner_la-scannerparser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='scannerparser.c' object='libgiscanner_la-scannerparser.lo' libtool=yes @AMDEPBACKSLASH@
+giscanner/libgiscanner_la-scannerparser.lo: giscanner/scannerparser.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiscanner_la_CPPFLAGS) $(CPPFLAGS) $(libgiscanner_la_CFLAGS) $(CFLAGS) -MT giscanner/libgiscanner_la-scannerparser.lo -MD -MP -MF giscanner/$(DEPDIR)/libgiscanner_la-scannerparser.Tpo -c -o giscanner/libgiscanner_la-scannerparser.lo `test -f 'giscanner/scannerparser.c' || echo '$(srcdir)/'`giscanner/scannerparser.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) giscanner/$(DEPDIR)/libgiscanner_la-scannerparser.Tpo giscanner/$(DEPDIR)/libgiscanner_la-scannerparser.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='giscanner/scannerparser.c' object='giscanner/libgiscanner_la-scannerparser.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiscanner_la_CPPFLAGS) $(CPPFLAGS) $(libgiscanner_la_CFLAGS) $(CFLAGS) -c -o libgiscanner_la-scannerparser.lo `test -f 'scannerparser.c' || echo '$(srcdir)/'`scannerparser.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiscanner_la_CPPFLAGS) $(CPPFLAGS) $(libgiscanner_la_CFLAGS) $(CFLAGS) -c -o giscanner/libgiscanner_la-scannerparser.lo `test -f 'giscanner/scannerparser.c' || echo '$(srcdir)/'`giscanner/scannerparser.c
 
-cmph_bdz_test-cmph-bdz-test.o: girepository/cmph-bdz-test.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cmph_bdz_test_CFLAGS) $(CFLAGS) -MT cmph_bdz_test-cmph-bdz-test.o -MD -MP -MF $(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Tpo -c -o cmph_bdz_test-cmph-bdz-test.o `test -f 'girepository/cmph-bdz-test.c' || echo '$(srcdir)/'`girepository/cmph-bdz-test.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Tpo $(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph-bdz-test.c' object='cmph_bdz_test-cmph-bdz-test.o' libtool=no @AMDEPBACKSLASH@
+girepository/cmph_bdz_test-cmph-bdz-test.o: girepository/cmph-bdz-test.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cmph_bdz_test_CFLAGS) $(CFLAGS) -MT girepository/cmph_bdz_test-cmph-bdz-test.o -MD -MP -MF girepository/$(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Tpo -c -o girepository/cmph_bdz_test-cmph-bdz-test.o `test -f 'girepository/cmph-bdz-test.c' || echo '$(srcdir)/'`girepository/cmph-bdz-test.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Tpo girepository/$(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph-bdz-test.c' object='girepository/cmph_bdz_test-cmph-bdz-test.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cmph_bdz_test_CFLAGS) $(CFLAGS) -c -o cmph_bdz_test-cmph-bdz-test.o `test -f 'girepository/cmph-bdz-test.c' || echo '$(srcdir)/'`girepository/cmph-bdz-test.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cmph_bdz_test_CFLAGS) $(CFLAGS) -c -o girepository/cmph_bdz_test-cmph-bdz-test.o `test -f 'girepository/cmph-bdz-test.c' || echo '$(srcdir)/'`girepository/cmph-bdz-test.c
 
-cmph_bdz_test-cmph-bdz-test.obj: girepository/cmph-bdz-test.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cmph_bdz_test_CFLAGS) $(CFLAGS) -MT cmph_bdz_test-cmph-bdz-test.obj -MD -MP -MF $(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Tpo -c -o cmph_bdz_test-cmph-bdz-test.obj `if test -f 'girepository/cmph-bdz-test.c'; then $(CYGPATH_W) 'girepository/cmph-bdz-test.c'; else $(CYGPATH_W) '$(srcdir)/girepository/cmph-bdz-test.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Tpo $(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph-bdz-test.c' object='cmph_bdz_test-cmph-bdz-test.obj' libtool=no @AMDEPBACKSLASH@
+girepository/cmph_bdz_test-cmph-bdz-test.obj: girepository/cmph-bdz-test.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cmph_bdz_test_CFLAGS) $(CFLAGS) -MT girepository/cmph_bdz_test-cmph-bdz-test.obj -MD -MP -MF girepository/$(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Tpo -c -o girepository/cmph_bdz_test-cmph-bdz-test.obj `if test -f 'girepository/cmph-bdz-test.c'; then $(CYGPATH_W) 'girepository/cmph-bdz-test.c'; else $(CYGPATH_W) '$(srcdir)/girepository/cmph-bdz-test.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Tpo girepository/$(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/cmph-bdz-test.c' object='girepository/cmph_bdz_test-cmph-bdz-test.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cmph_bdz_test_CFLAGS) $(CFLAGS) -c -o cmph_bdz_test-cmph-bdz-test.obj `if test -f 'girepository/cmph-bdz-test.c'; then $(CYGPATH_W) 'girepository/cmph-bdz-test.c'; else $(CYGPATH_W) '$(srcdir)/girepository/cmph-bdz-test.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cmph_bdz_test_CFLAGS) $(CFLAGS) -c -o girepository/cmph_bdz_test-cmph-bdz-test.obj `if test -f 'girepository/cmph-bdz-test.c'; then $(CYGPATH_W) 'girepository/cmph-bdz-test.c'; else $(CYGPATH_W) '$(srcdir)/girepository/cmph-bdz-test.c'; fi`
 
-g_ir_compiler-compiler.o: tools/compiler.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_compiler_CPPFLAGS) $(CPPFLAGS) $(g_ir_compiler_CFLAGS) $(CFLAGS) -MT g_ir_compiler-compiler.o -MD -MP -MF $(DEPDIR)/g_ir_compiler-compiler.Tpo -c -o g_ir_compiler-compiler.o `test -f 'tools/compiler.c' || echo '$(srcdir)/'`tools/compiler.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/g_ir_compiler-compiler.Tpo $(DEPDIR)/g_ir_compiler-compiler.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='tools/compiler.c' object='g_ir_compiler-compiler.o' libtool=no @AMDEPBACKSLASH@
+tools/g_ir_compiler-compiler.o: tools/compiler.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_compiler_CPPFLAGS) $(CPPFLAGS) $(g_ir_compiler_CFLAGS) $(CFLAGS) -MT tools/g_ir_compiler-compiler.o -MD -MP -MF tools/$(DEPDIR)/g_ir_compiler-compiler.Tpo -c -o tools/g_ir_compiler-compiler.o `test -f 'tools/compiler.c' || echo '$(srcdir)/'`tools/compiler.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) tools/$(DEPDIR)/g_ir_compiler-compiler.Tpo tools/$(DEPDIR)/g_ir_compiler-compiler.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='tools/compiler.c' object='tools/g_ir_compiler-compiler.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_compiler_CPPFLAGS) $(CPPFLAGS) $(g_ir_compiler_CFLAGS) $(CFLAGS) -c -o g_ir_compiler-compiler.o `test -f 'tools/compiler.c' || echo '$(srcdir)/'`tools/compiler.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_compiler_CPPFLAGS) $(CPPFLAGS) $(g_ir_compiler_CFLAGS) $(CFLAGS) -c -o tools/g_ir_compiler-compiler.o `test -f 'tools/compiler.c' || echo '$(srcdir)/'`tools/compiler.c
 
-g_ir_compiler-compiler.obj: tools/compiler.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_compiler_CPPFLAGS) $(CPPFLAGS) $(g_ir_compiler_CFLAGS) $(CFLAGS) -MT g_ir_compiler-compiler.obj -MD -MP -MF $(DEPDIR)/g_ir_compiler-compiler.Tpo -c -o g_ir_compiler-compiler.obj `if test -f 'tools/compiler.c'; then $(CYGPATH_W) 'tools/compiler.c'; else $(CYGPATH_W) '$(srcdir)/tools/compiler.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/g_ir_compiler-compiler.Tpo $(DEPDIR)/g_ir_compiler-compiler.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='tools/compiler.c' object='g_ir_compiler-compiler.obj' libtool=no @AMDEPBACKSLASH@
+tools/g_ir_compiler-compiler.obj: tools/compiler.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_compiler_CPPFLAGS) $(CPPFLAGS) $(g_ir_compiler_CFLAGS) $(CFLAGS) -MT tools/g_ir_compiler-compiler.obj -MD -MP -MF tools/$(DEPDIR)/g_ir_compiler-compiler.Tpo -c -o tools/g_ir_compiler-compiler.obj `if test -f 'tools/compiler.c'; then $(CYGPATH_W) 'tools/compiler.c'; else $(CYGPATH_W) '$(srcdir)/tools/compiler.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) tools/$(DEPDIR)/g_ir_compiler-compiler.Tpo tools/$(DEPDIR)/g_ir_compiler-compiler.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='tools/compiler.c' object='tools/g_ir_compiler-compiler.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_compiler_CPPFLAGS) $(CPPFLAGS) $(g_ir_compiler_CFLAGS) $(CFLAGS) -c -o g_ir_compiler-compiler.obj `if test -f 'tools/compiler.c'; then $(CYGPATH_W) 'tools/compiler.c'; else $(CYGPATH_W) '$(srcdir)/tools/compiler.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_compiler_CPPFLAGS) $(CPPFLAGS) $(g_ir_compiler_CFLAGS) $(CFLAGS) -c -o tools/g_ir_compiler-compiler.obj `if test -f 'tools/compiler.c'; then $(CYGPATH_W) 'tools/compiler.c'; else $(CYGPATH_W) '$(srcdir)/tools/compiler.c'; fi`
 
-g_ir_generate-generate.o: tools/generate.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_generate_CPPFLAGS) $(CPPFLAGS) $(g_ir_generate_CFLAGS) $(CFLAGS) -MT g_ir_generate-generate.o -MD -MP -MF $(DEPDIR)/g_ir_generate-generate.Tpo -c -o g_ir_generate-generate.o `test -f 'tools/generate.c' || echo '$(srcdir)/'`tools/generate.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/g_ir_generate-generate.Tpo $(DEPDIR)/g_ir_generate-generate.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='tools/generate.c' object='g_ir_generate-generate.o' libtool=no @AMDEPBACKSLASH@
+tools/g_ir_generate-generate.o: tools/generate.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_generate_CPPFLAGS) $(CPPFLAGS) $(g_ir_generate_CFLAGS) $(CFLAGS) -MT tools/g_ir_generate-generate.o -MD -MP -MF tools/$(DEPDIR)/g_ir_generate-generate.Tpo -c -o tools/g_ir_generate-generate.o `test -f 'tools/generate.c' || echo '$(srcdir)/'`tools/generate.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) tools/$(DEPDIR)/g_ir_generate-generate.Tpo tools/$(DEPDIR)/g_ir_generate-generate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='tools/generate.c' object='tools/g_ir_generate-generate.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_generate_CPPFLAGS) $(CPPFLAGS) $(g_ir_generate_CFLAGS) $(CFLAGS) -c -o g_ir_generate-generate.o `test -f 'tools/generate.c' || echo '$(srcdir)/'`tools/generate.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_generate_CPPFLAGS) $(CPPFLAGS) $(g_ir_generate_CFLAGS) $(CFLAGS) -c -o tools/g_ir_generate-generate.o `test -f 'tools/generate.c' || echo '$(srcdir)/'`tools/generate.c
 
-g_ir_generate-generate.obj: tools/generate.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_generate_CPPFLAGS) $(CPPFLAGS) $(g_ir_generate_CFLAGS) $(CFLAGS) -MT g_ir_generate-generate.obj -MD -MP -MF $(DEPDIR)/g_ir_generate-generate.Tpo -c -o g_ir_generate-generate.obj `if test -f 'tools/generate.c'; then $(CYGPATH_W) 'tools/generate.c'; else $(CYGPATH_W) '$(srcdir)/tools/generate.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/g_ir_generate-generate.Tpo $(DEPDIR)/g_ir_generate-generate.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='tools/generate.c' object='g_ir_generate-generate.obj' libtool=no @AMDEPBACKSLASH@
+tools/g_ir_generate-generate.obj: tools/generate.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_generate_CPPFLAGS) $(CPPFLAGS) $(g_ir_generate_CFLAGS) $(CFLAGS) -MT tools/g_ir_generate-generate.obj -MD -MP -MF tools/$(DEPDIR)/g_ir_generate-generate.Tpo -c -o tools/g_ir_generate-generate.obj `if test -f 'tools/generate.c'; then $(CYGPATH_W) 'tools/generate.c'; else $(CYGPATH_W) '$(srcdir)/tools/generate.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) tools/$(DEPDIR)/g_ir_generate-generate.Tpo tools/$(DEPDIR)/g_ir_generate-generate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='tools/generate.c' object='tools/g_ir_generate-generate.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_generate_CPPFLAGS) $(CPPFLAGS) $(g_ir_generate_CFLAGS) $(CFLAGS) -c -o g_ir_generate-generate.obj `if test -f 'tools/generate.c'; then $(CYGPATH_W) 'tools/generate.c'; else $(CYGPATH_W) '$(srcdir)/tools/generate.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_generate_CPPFLAGS) $(CPPFLAGS) $(g_ir_generate_CFLAGS) $(CFLAGS) -c -o tools/g_ir_generate-generate.obj `if test -f 'tools/generate.c'; then $(CYGPATH_W) 'tools/generate.c'; else $(CYGPATH_W) '$(srcdir)/tools/generate.c'; fi`
 
-g_ir_inspect-g-ir-inspect.o: tools/g-ir-inspect.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(g_ir_inspect_CFLAGS) $(CFLAGS) -MT g_ir_inspect-g-ir-inspect.o -MD -MP -MF $(DEPDIR)/g_ir_inspect-g-ir-inspect.Tpo -c -o g_ir_inspect-g-ir-inspect.o `test -f 'tools/g-ir-inspect.c' || echo '$(srcdir)/'`tools/g-ir-inspect.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/g_ir_inspect-g-ir-inspect.Tpo $(DEPDIR)/g_ir_inspect-g-ir-inspect.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='tools/g-ir-inspect.c' object='g_ir_inspect-g-ir-inspect.o' libtool=no @AMDEPBACKSLASH@
+tools/g_ir_inspect-g-ir-inspect.o: tools/g-ir-inspect.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(g_ir_inspect_CFLAGS) $(CFLAGS) -MT tools/g_ir_inspect-g-ir-inspect.o -MD -MP -MF tools/$(DEPDIR)/g_ir_inspect-g-ir-inspect.Tpo -c -o tools/g_ir_inspect-g-ir-inspect.o `test -f 'tools/g-ir-inspect.c' || echo '$(srcdir)/'`tools/g-ir-inspect.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) tools/$(DEPDIR)/g_ir_inspect-g-ir-inspect.Tpo tools/$(DEPDIR)/g_ir_inspect-g-ir-inspect.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='tools/g-ir-inspect.c' object='tools/g_ir_inspect-g-ir-inspect.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(g_ir_inspect_CFLAGS) $(CFLAGS) -c -o g_ir_inspect-g-ir-inspect.o `test -f 'tools/g-ir-inspect.c' || echo '$(srcdir)/'`tools/g-ir-inspect.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(g_ir_inspect_CFLAGS) $(CFLAGS) -c -o tools/g_ir_inspect-g-ir-inspect.o `test -f 'tools/g-ir-inspect.c' || echo '$(srcdir)/'`tools/g-ir-inspect.c
 
-g_ir_inspect-g-ir-inspect.obj: tools/g-ir-inspect.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(g_ir_inspect_CFLAGS) $(CFLAGS) -MT g_ir_inspect-g-ir-inspect.obj -MD -MP -MF $(DEPDIR)/g_ir_inspect-g-ir-inspect.Tpo -c -o g_ir_inspect-g-ir-inspect.obj `if test -f 'tools/g-ir-inspect.c'; then $(CYGPATH_W) 'tools/g-ir-inspect.c'; else $(CYGPATH_W) '$(srcdir)/tools/g-ir-inspect.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/g_ir_inspect-g-ir-inspect.Tpo $(DEPDIR)/g_ir_inspect-g-ir-inspect.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='tools/g-ir-inspect.c' object='g_ir_inspect-g-ir-inspect.obj' libtool=no @AMDEPBACKSLASH@
+tools/g_ir_inspect-g-ir-inspect.obj: tools/g-ir-inspect.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(g_ir_inspect_CFLAGS) $(CFLAGS) -MT tools/g_ir_inspect-g-ir-inspect.obj -MD -MP -MF tools/$(DEPDIR)/g_ir_inspect-g-ir-inspect.Tpo -c -o tools/g_ir_inspect-g-ir-inspect.obj `if test -f 'tools/g-ir-inspect.c'; then $(CYGPATH_W) 'tools/g-ir-inspect.c'; else $(CYGPATH_W) '$(srcdir)/tools/g-ir-inspect.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) tools/$(DEPDIR)/g_ir_inspect-g-ir-inspect.Tpo tools/$(DEPDIR)/g_ir_inspect-g-ir-inspect.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='tools/g-ir-inspect.c' object='tools/g_ir_inspect-g-ir-inspect.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(g_ir_inspect_CFLAGS) $(CFLAGS) -c -o g_ir_inspect-g-ir-inspect.obj `if test -f 'tools/g-ir-inspect.c'; then $(CYGPATH_W) 'tools/g-ir-inspect.c'; else $(CYGPATH_W) '$(srcdir)/tools/g-ir-inspect.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(g_ir_inspect_CFLAGS) $(CFLAGS) -c -o tools/g_ir_inspect-g-ir-inspect.obj `if test -f 'tools/g-ir-inspect.c'; then $(CYGPATH_W) 'tools/g-ir-inspect.c'; else $(CYGPATH_W) '$(srcdir)/tools/g-ir-inspect.c'; fi`
 
-gi_dump_types-gdump.o: girepository/gdump.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -MT gi_dump_types-gdump.o -MD -MP -MF $(DEPDIR)/gi_dump_types-gdump.Tpo -c -o gi_dump_types-gdump.o `test -f 'girepository/gdump.c' || echo '$(srcdir)/'`girepository/gdump.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gi_dump_types-gdump.Tpo $(DEPDIR)/gi_dump_types-gdump.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gdump.c' object='gi_dump_types-gdump.o' libtool=no @AMDEPBACKSLASH@
+girepository/gi_dump_types-gdump.o: girepository/gdump.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -MT girepository/gi_dump_types-gdump.o -MD -MP -MF girepository/$(DEPDIR)/gi_dump_types-gdump.Tpo -c -o girepository/gi_dump_types-gdump.o `test -f 'girepository/gdump.c' || echo '$(srcdir)/'`girepository/gdump.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/gi_dump_types-gdump.Tpo girepository/$(DEPDIR)/gi_dump_types-gdump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gdump.c' object='girepository/gi_dump_types-gdump.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -c -o gi_dump_types-gdump.o `test -f 'girepository/gdump.c' || echo '$(srcdir)/'`girepository/gdump.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -c -o girepository/gi_dump_types-gdump.o `test -f 'girepository/gdump.c' || echo '$(srcdir)/'`girepository/gdump.c
 
-gi_dump_types-gdump.obj: girepository/gdump.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -MT gi_dump_types-gdump.obj -MD -MP -MF $(DEPDIR)/gi_dump_types-gdump.Tpo -c -o gi_dump_types-gdump.obj `if test -f 'girepository/gdump.c'; then $(CYGPATH_W) 'girepository/gdump.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gdump.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gi_dump_types-gdump.Tpo $(DEPDIR)/gi_dump_types-gdump.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gdump.c' object='gi_dump_types-gdump.obj' libtool=no @AMDEPBACKSLASH@
+girepository/gi_dump_types-gdump.obj: girepository/gdump.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -MT girepository/gi_dump_types-gdump.obj -MD -MP -MF girepository/$(DEPDIR)/gi_dump_types-gdump.Tpo -c -o girepository/gi_dump_types-gdump.obj `if test -f 'girepository/gdump.c'; then $(CYGPATH_W) 'girepository/gdump.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gdump.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/gi_dump_types-gdump.Tpo girepository/$(DEPDIR)/gi_dump_types-gdump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gdump.c' object='girepository/gi_dump_types-gdump.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -c -o gi_dump_types-gdump.obj `if test -f 'girepository/gdump.c'; then $(CYGPATH_W) 'girepository/gdump.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gdump.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -c -o girepository/gi_dump_types-gdump.obj `if test -f 'girepository/gdump.c'; then $(CYGPATH_W) 'girepository/gdump.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gdump.c'; fi`
 
-gi_dump_types-gi-dump-types.o: girepository/gi-dump-types.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -MT gi_dump_types-gi-dump-types.o -MD -MP -MF $(DEPDIR)/gi_dump_types-gi-dump-types.Tpo -c -o gi_dump_types-gi-dump-types.o `test -f 'girepository/gi-dump-types.c' || echo '$(srcdir)/'`girepository/gi-dump-types.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gi_dump_types-gi-dump-types.Tpo $(DEPDIR)/gi_dump_types-gi-dump-types.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gi-dump-types.c' object='gi_dump_types-gi-dump-types.o' libtool=no @AMDEPBACKSLASH@
+girepository/gi_dump_types-gi-dump-types.o: girepository/gi-dump-types.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -MT girepository/gi_dump_types-gi-dump-types.o -MD -MP -MF girepository/$(DEPDIR)/gi_dump_types-gi-dump-types.Tpo -c -o girepository/gi_dump_types-gi-dump-types.o `test -f 'girepository/gi-dump-types.c' || echo '$(srcdir)/'`girepository/gi-dump-types.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/gi_dump_types-gi-dump-types.Tpo girepository/$(DEPDIR)/gi_dump_types-gi-dump-types.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gi-dump-types.c' object='girepository/gi_dump_types-gi-dump-types.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -c -o gi_dump_types-gi-dump-types.o `test -f 'girepository/gi-dump-types.c' || echo '$(srcdir)/'`girepository/gi-dump-types.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -c -o girepository/gi_dump_types-gi-dump-types.o `test -f 'girepository/gi-dump-types.c' || echo '$(srcdir)/'`girepository/gi-dump-types.c
 
-gi_dump_types-gi-dump-types.obj: girepository/gi-dump-types.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -MT gi_dump_types-gi-dump-types.obj -MD -MP -MF $(DEPDIR)/gi_dump_types-gi-dump-types.Tpo -c -o gi_dump_types-gi-dump-types.obj `if test -f 'girepository/gi-dump-types.c'; then $(CYGPATH_W) 'girepository/gi-dump-types.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gi-dump-types.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gi_dump_types-gi-dump-types.Tpo $(DEPDIR)/gi_dump_types-gi-dump-types.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gi-dump-types.c' object='gi_dump_types-gi-dump-types.obj' libtool=no @AMDEPBACKSLASH@
+girepository/gi_dump_types-gi-dump-types.obj: girepository/gi-dump-types.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -MT girepository/gi_dump_types-gi-dump-types.obj -MD -MP -MF girepository/$(DEPDIR)/gi_dump_types-gi-dump-types.Tpo -c -o girepository/gi_dump_types-gi-dump-types.obj `if test -f 'girepository/gi-dump-types.c'; then $(CYGPATH_W) 'girepository/gi-dump-types.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gi-dump-types.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/gi_dump_types-gi-dump-types.Tpo girepository/$(DEPDIR)/gi_dump_types-gi-dump-types.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gi-dump-types.c' object='girepository/gi_dump_types-gi-dump-types.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -c -o gi_dump_types-gi-dump-types.obj `if test -f 'girepository/gi-dump-types.c'; then $(CYGPATH_W) 'girepository/gi-dump-types.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gi-dump-types.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -c -o girepository/gi_dump_types-gi-dump-types.obj `if test -f 'girepository/gi-dump-types.c'; then $(CYGPATH_W) 'girepository/gi-dump-types.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gi-dump-types.c'; fi`
 
-glib_print-glib-print.o: examples/glib-print.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_print_CFLAGS) $(CFLAGS) -MT glib_print-glib-print.o -MD -MP -MF $(DEPDIR)/glib_print-glib-print.Tpo -c -o glib_print-glib-print.o `test -f 'examples/glib-print.c' || echo '$(srcdir)/'`examples/glib-print.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/glib_print-glib-print.Tpo $(DEPDIR)/glib_print-glib-print.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='examples/glib-print.c' object='glib_print-glib-print.o' libtool=no @AMDEPBACKSLASH@
+examples/glib_print-glib-print.o: examples/glib-print.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_print_CFLAGS) $(CFLAGS) -MT examples/glib_print-glib-print.o -MD -MP -MF examples/$(DEPDIR)/glib_print-glib-print.Tpo -c -o examples/glib_print-glib-print.o `test -f 'examples/glib-print.c' || echo '$(srcdir)/'`examples/glib-print.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) examples/$(DEPDIR)/glib_print-glib-print.Tpo examples/$(DEPDIR)/glib_print-glib-print.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='examples/glib-print.c' object='examples/glib_print-glib-print.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_print_CFLAGS) $(CFLAGS) -c -o glib_print-glib-print.o `test -f 'examples/glib-print.c' || echo '$(srcdir)/'`examples/glib-print.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_print_CFLAGS) $(CFLAGS) -c -o examples/glib_print-glib-print.o `test -f 'examples/glib-print.c' || echo '$(srcdir)/'`examples/glib-print.c
 
-glib_print-glib-print.obj: examples/glib-print.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_print_CFLAGS) $(CFLAGS) -MT glib_print-glib-print.obj -MD -MP -MF $(DEPDIR)/glib_print-glib-print.Tpo -c -o glib_print-glib-print.obj `if test -f 'examples/glib-print.c'; then $(CYGPATH_W) 'examples/glib-print.c'; else $(CYGPATH_W) '$(srcdir)/examples/glib-print.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/glib_print-glib-print.Tpo $(DEPDIR)/glib_print-glib-print.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='examples/glib-print.c' object='glib_print-glib-print.obj' libtool=no @AMDEPBACKSLASH@
+examples/glib_print-glib-print.obj: examples/glib-print.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_print_CFLAGS) $(CFLAGS) -MT examples/glib_print-glib-print.obj -MD -MP -MF examples/$(DEPDIR)/glib_print-glib-print.Tpo -c -o examples/glib_print-glib-print.obj `if test -f 'examples/glib-print.c'; then $(CYGPATH_W) 'examples/glib-print.c'; else $(CYGPATH_W) '$(srcdir)/examples/glib-print.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) examples/$(DEPDIR)/glib_print-glib-print.Tpo examples/$(DEPDIR)/glib_print-glib-print.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='examples/glib-print.c' object='examples/glib_print-glib-print.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_print_CFLAGS) $(CFLAGS) -c -o glib_print-glib-print.obj `if test -f 'examples/glib-print.c'; then $(CYGPATH_W) 'examples/glib-print.c'; else $(CYGPATH_W) '$(srcdir)/examples/glib-print.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_print_CFLAGS) $(CFLAGS) -c -o examples/glib_print-glib-print.obj `if test -f 'examples/glib-print.c'; then $(CYGPATH_W) 'examples/glib-print.c'; else $(CYGPATH_W) '$(srcdir)/examples/glib-print.c'; fi`
 
-gthash_test-gthash.o: girepository/gthash.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -MT gthash_test-gthash.o -MD -MP -MF $(DEPDIR)/gthash_test-gthash.Tpo -c -o gthash_test-gthash.o `test -f 'girepository/gthash.c' || echo '$(srcdir)/'`girepository/gthash.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gthash_test-gthash.Tpo $(DEPDIR)/gthash_test-gthash.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gthash.c' object='gthash_test-gthash.o' libtool=no @AMDEPBACKSLASH@
+girepository/gthash_test-gthash.o: girepository/gthash.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -MT girepository/gthash_test-gthash.o -MD -MP -MF girepository/$(DEPDIR)/gthash_test-gthash.Tpo -c -o girepository/gthash_test-gthash.o `test -f 'girepository/gthash.c' || echo '$(srcdir)/'`girepository/gthash.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/gthash_test-gthash.Tpo girepository/$(DEPDIR)/gthash_test-gthash.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gthash.c' object='girepository/gthash_test-gthash.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -c -o gthash_test-gthash.o `test -f 'girepository/gthash.c' || echo '$(srcdir)/'`girepository/gthash.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -c -o girepository/gthash_test-gthash.o `test -f 'girepository/gthash.c' || echo '$(srcdir)/'`girepository/gthash.c
 
-gthash_test-gthash.obj: girepository/gthash.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -MT gthash_test-gthash.obj -MD -MP -MF $(DEPDIR)/gthash_test-gthash.Tpo -c -o gthash_test-gthash.obj `if test -f 'girepository/gthash.c'; then $(CYGPATH_W) 'girepository/gthash.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gthash.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gthash_test-gthash.Tpo $(DEPDIR)/gthash_test-gthash.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gthash.c' object='gthash_test-gthash.obj' libtool=no @AMDEPBACKSLASH@
+girepository/gthash_test-gthash.obj: girepository/gthash.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -MT girepository/gthash_test-gthash.obj -MD -MP -MF girepository/$(DEPDIR)/gthash_test-gthash.Tpo -c -o girepository/gthash_test-gthash.obj `if test -f 'girepository/gthash.c'; then $(CYGPATH_W) 'girepository/gthash.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gthash.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/gthash_test-gthash.Tpo girepository/$(DEPDIR)/gthash_test-gthash.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gthash.c' object='girepository/gthash_test-gthash.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -c -o gthash_test-gthash.obj `if test -f 'girepository/gthash.c'; then $(CYGPATH_W) 'girepository/gthash.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gthash.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -c -o girepository/gthash_test-gthash.obj `if test -f 'girepository/gthash.c'; then $(CYGPATH_W) 'girepository/gthash.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gthash.c'; fi`
 
-gthash_test-gthash-test.o: girepository/gthash-test.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -MT gthash_test-gthash-test.o -MD -MP -MF $(DEPDIR)/gthash_test-gthash-test.Tpo -c -o gthash_test-gthash-test.o `test -f 'girepository/gthash-test.c' || echo '$(srcdir)/'`girepository/gthash-test.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gthash_test-gthash-test.Tpo $(DEPDIR)/gthash_test-gthash-test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gthash-test.c' object='gthash_test-gthash-test.o' libtool=no @AMDEPBACKSLASH@
+girepository/gthash_test-gthash-test.o: girepository/gthash-test.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -MT girepository/gthash_test-gthash-test.o -MD -MP -MF girepository/$(DEPDIR)/gthash_test-gthash-test.Tpo -c -o girepository/gthash_test-gthash-test.o `test -f 'girepository/gthash-test.c' || echo '$(srcdir)/'`girepository/gthash-test.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/gthash_test-gthash-test.Tpo girepository/$(DEPDIR)/gthash_test-gthash-test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gthash-test.c' object='girepository/gthash_test-gthash-test.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -c -o gthash_test-gthash-test.o `test -f 'girepository/gthash-test.c' || echo '$(srcdir)/'`girepository/gthash-test.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -c -o girepository/gthash_test-gthash-test.o `test -f 'girepository/gthash-test.c' || echo '$(srcdir)/'`girepository/gthash-test.c
 
-gthash_test-gthash-test.obj: girepository/gthash-test.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -MT gthash_test-gthash-test.obj -MD -MP -MF $(DEPDIR)/gthash_test-gthash-test.Tpo -c -o gthash_test-gthash-test.obj `if test -f 'girepository/gthash-test.c'; then $(CYGPATH_W) 'girepository/gthash-test.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gthash-test.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gthash_test-gthash-test.Tpo $(DEPDIR)/gthash_test-gthash-test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gthash-test.c' object='gthash_test-gthash-test.obj' libtool=no @AMDEPBACKSLASH@
+girepository/gthash_test-gthash-test.obj: girepository/gthash-test.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -MT girepository/gthash_test-gthash-test.obj -MD -MP -MF girepository/$(DEPDIR)/gthash_test-gthash-test.Tpo -c -o girepository/gthash_test-gthash-test.obj `if test -f 'girepository/gthash-test.c'; then $(CYGPATH_W) 'girepository/gthash-test.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gthash-test.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) girepository/$(DEPDIR)/gthash_test-gthash-test.Tpo girepository/$(DEPDIR)/gthash_test-gthash-test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girepository/gthash-test.c' object='girepository/gthash_test-gthash-test.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -c -o gthash_test-gthash-test.obj `if test -f 'girepository/gthash-test.c'; then $(CYGPATH_W) 'girepository/gthash-test.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gthash-test.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthash_test_CFLAGS) $(CFLAGS) -c -o girepository/gthash_test-gthash-test.obj `if test -f 'girepository/gthash-test.c'; then $(CYGPATH_W) 'girepository/gthash-test.c'; else $(CYGPATH_W) '$(srcdir)/girepository/gthash-test.c'; fi`
 
 .l.c:
        $(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
 
-scannerlexer.c: giscanner/scannerlexer.l
-       $(AM_V_LEX) \
-       $(am__skiplex) \
-       $(SHELL) $(YLWRAP) `test -f 'giscanner/scannerlexer.l' || echo '$(srcdir)/'`giscanner/scannerlexer.l $(LEX_OUTPUT_ROOT).c scannerlexer.c -- $(LEX) $(AM_LFLAGS) $(LFLAGS)
-
 .y.c:
        $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
 
-scannerparser.c: giscanner/scannerparser.y
-       $(AM_V_YACC) \
-       $(am__skipyacc) \
-       $(SHELL) $(YLWRAP) `test -f 'giscanner/scannerparser.y' || echo '$(srcdir)/'`giscanner/scannerparser.y y.tab.c scannerparser.c y.tab.h `echo scannerparser.c | $(am__yacc_c2h)` y.output scannerparser.output -- $(YACC) $(AM_YFLAGS) $(YFLAGS)
-
 mostlyclean-libtool:
        -rm -f *.lo
 
 clean-libtool:
        -rm -rf .libs _libs
+       -rm -rf girepository/.libs girepository/_libs
+       -rm -rf girepository/cmph/.libs girepository/cmph/_libs
+       -rm -rf giscanner/.libs giscanner/_libs
 
 distclean-libtool:
        -rm -f libtool config.lt
@@ -3318,14 +3551,24 @@ clean-generic:
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+       -rm -f examples/$(DEPDIR)/$(am__dirstamp)
+       -rm -f examples/$(am__dirstamp)
+       -rm -f girepository/$(DEPDIR)/$(am__dirstamp)
+       -rm -f girepository/$(am__dirstamp)
+       -rm -f girepository/cmph/$(DEPDIR)/$(am__dirstamp)
+       -rm -f girepository/cmph/$(am__dirstamp)
+       -rm -f giscanner/$(DEPDIR)/$(am__dirstamp)
+       -rm -f giscanner/$(am__dirstamp)
+       -rm -f tools/$(DEPDIR)/$(am__dirstamp)
+       -rm -f tools/$(am__dirstamp)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-       -rm -f scannerlexer.c
-       -rm -f scannerparser.c
-       -rm -f scannerparser.h
+       -rm -f giscanner/scannerlexer.c
+       -rm -f giscanner/scannerparser.c
+       -rm -f giscanner/scannerparser.h
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-recursive
 
@@ -3336,7 +3579,7 @@ clean-am: clean-binPROGRAMS clean-checkLTLIBRARIES clean-checkPROGRAMS \
 
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -rf ./$(DEPDIR)
+       -rm -rf examples/$(DEPDIR) girepository/$(DEPDIR) girepository/cmph/$(DEPDIR) giscanner/$(DEPDIR) tools/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-hdr distclean-libtool distclean-tags
@@ -3389,7 +3632,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
-       -rm -rf ./$(DEPDIR)
+       -rm -rf examples/$(DEPDIR) girepository/$(DEPDIR) girepository/cmph/$(DEPDIR) giscanner/$(DEPDIR) tools/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -3546,7 +3789,7 @@ endef
        $(call introspection-compiler,$<,$@)
 
 # Why do I have to do this automake?
-scannerlexer.h: scannerlexer.c
+giscanner/scannerlexer.h: giscanner/scannerlexer.c
 
 gir/cairo-1.0.gir: gir/cairo-1.0.gir.in Makefile
        [ -d $(@D) ] || $(mkdir_p) $(@D) ; \

diff --git a/Makefile.introspection b/Makefile.introspection
index 042cc65..5b38e35 100644 (file)
--- a/Makefile.introspection
+++ b/Makefile.introspection
@@ -85,7 +85,7 @@ _gir_silent_compiler = $(_gir_silent_compiler_$(V))
 _gir_silent_compiler_ = $(_gir_silent_compiler_$(_gir_verbosity))
 _gir_silent_compiler_0 = @echo "  GICOMP   $(1)";
 
-_gir_default_scanner_env = CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)"
+_gir_default_scanner_env = CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" GI_HOST_OS="$(GI_HOST_OS)" DLLTOOL="$(DLLTOOL)"
 
 #
 # Creates a GIR by scanning C headers/sources

diff --git a/NEWS b/NEWS
index ba814dc..928b4f6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,38 @@
-For NEWS for newer releases see git shortlog
+=== 2.56 ======================================================================
+
+    • Changes:
+      - Add _Float128 to the base C types
+      - Update annotations imported from GLib, and require GLib 2.56
+
+    • Issues resolved on gitlab.gnome.org:
+      - #173 - Fails to parse flag-constants
+      - #175 - writer: Include documentation and symbol position in
+               source files
+      - #120 - adding subdir-objects to AM_INIT_AUTOMAKE
+      - #190 - const qualifier dropped from c:type on (type filename)
+               parameters
+      - #188 - giscanner: don't print "suppressed N warnings" if --quiet
+               was specified
+
+    • Bugs resolved on bugzilla.gnome.org:
+      - #764791 - gitypelib.c: increase #define MAX_NAME_LEN from 200 to 255
+      - #756921 - g-ir-scanner does not recognize _Thread_local
+      - #791991 - Broken shared-library value in gir files on *BSD when
+                  builddir includes the name of the library
+      - #791902 - Building using non-libtool (e.g., meson) on MinGW
+      - #629667 - MY_ENUM_VALUE = <constant> only works for last member
+      - #699354 - g-ir-compiler man page for --shared-library incorrectly
+                  says "lib" and ".so" should be removed
+      - #761985 - os.name can be wrong in some context
+      - #699328 - GI_TYPELIB_PATH is undocumented
+
+    • Contributors:
+      Ting-Wei Lan, Leslie Giles, Rico Tzschichholz, Christoph Reiter,
+      Nicola Fontana, Tomasz Miąsko, Emmanuele Bassi, Philip Chimento,
+      Karl-Philipp Richter
+
+---
+For older releases, see the Git log
 ---
 0.6.3 22-jun 2009
     Bugs resolved:

diff --git a/config.h.win32 b/config.h.win32
index 73f8c93..bb53464 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -96,7 +96,7 @@
 #define PACKAGE_NAME "gobject-introspection"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gojbect-introspection 1.55.1"
+#define PACKAGE_STRING "gojbect-introspection 1.55.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gobject-introspection"
@@ -105,7 +105,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.55.1"
+#define PACKAGE_VERSION "1.55.2"
 
 /* Define to the platform's shared library suffix */
 #define SHLIB_SUFFIX ".dll"
@@ -126,7 +126,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.55.1"
+#define VERSION "1.55.2"
 
 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
    `char[]'. */

diff --git a/configure b/configure
index 2802f30..e962974 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gobject-introspection 1.55.1.
+# Generated by GNU Autoconf 2.69 for gobject-introspection 1.55.2.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gobject-introspection'
 PACKAGE_TARNAME='gobject-introspection'
-PACKAGE_VERSION='1.55.1'
-PACKAGE_STRING='gobject-introspection 1.55.1'
+PACKAGE_VERSION='1.55.2'
+PACKAGE_STRING='gobject-introspection 1.55.2'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection'
 PACKAGE_URL=''
 
@@ -1449,7 +1449,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gobject-introspection 1.55.1 to adapt to many kinds of systems.
+\`configure' configures gobject-introspection 1.55.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1521,7 +1521,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gobject-introspection 1.55.1:";;
+     short | recursive ) echo "Configuration of gobject-introspection 1.55.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1683,7 +1683,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gobject-introspection configure 1.55.1
+gobject-introspection configure 1.55.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2235,7 +2235,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gobject-introspection $as_me 1.55.1, which was
+It was created by gobject-introspection $as_me 1.55.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3103,7 +3103,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gobject-introspection'
- VERSION='1.55.1'
+ VERSION='1.55.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3377,7 +3377,7 @@ AM_BACKSLASH='\'
 
 
 # Used in docs/reference/version.xml
-GI_VERSION=1.55.1
+GI_VERSION=1.55.2
 
 
 # Check for Win32
@@ -13160,12 +13160,12 @@ if test -n "$GLIB_CFLAGS"; then
     pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.55.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.55.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.55.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.55.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.55.1" 2>/dev/null`
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.55.2" 2>/dev/null`
                      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13177,12 +13177,12 @@ if test -n "$GLIB_LIBS"; then
     pkg_cv_GLIB_LIBS="$GLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.55.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.55.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.55.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.55.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.55.1" 2>/dev/null`
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.55.2" 2>/dev/null`
                      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13203,14 +13203,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-               GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.55.1" 2>&1`
+               GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.55.2" 2>&1`
         else
-               GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.55.1" 2>&1`
+               GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.55.2" 2>&1`
         fi
        # Put the nasty error message in config.log where it belongs
        echo "$GLIB_PKG_ERRORS" >&5
 
-       as_fn_error $? "Package requirements (glib-2.0 >= 2.55.1) were not met:
+       as_fn_error $? "Package requirements (glib-2.0 >= 2.55.2) were not met:
 
 $GLIB_PKG_ERRORS
 
@@ -15402,7 +15402,7 @@ $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
 int
 main ()
 {
-int main (void) { return 0; }
+return 0
   ;
   return 0;
 }
@@ -15445,7 +15445,7 @@ $as_echo_n "checking for -Bsymbolic-functions linker flag... " >&6; }
 int
 main ()
 {
-int main (void) { return 0; }
+return 0
   ;
   return 0;
 }
@@ -16076,7 +16076,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gobject-introspection $as_me 1.55.1, which was
+This file was extended by gobject-introspection $as_me 1.55.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16142,7 +16142,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gobject-introspection config.status 1.55.1
+gobject-introspection config.status 1.55.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 283a2e5..3a0b196 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 dnl the gi version number
 m4_define(gi_major_version, 1)
 m4_define(gi_minor_version, 55)
-m4_define(gi_micro_version, 1)
+m4_define(gi_micro_version, 2)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
@@ -17,7 +17,7 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability parallel-tests])
+AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability parallel-tests subdir-objects])
 AM_MAINTAINER_MODE([enable])
 
 AM_SILENT_RULES([yes])
@@ -128,7 +128,7 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX"
 AC_SUBST(GIR_DIR)
 AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation])
 
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.55.1])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.55.2])
 
 PKG_CHECK_MODULES(GOBJECT, [gobject-2.0])
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
@@ -322,7 +322,7 @@ case "$host" in
     SAVED_CFLAGS="${CFLAGS}"
     CFLAGS="-fvisibility=hidden"
     AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
-    AC_TRY_COMPILE([], [int main (void) { return 0; }],
+    AC_TRY_COMPILE([], [return 0],
                    AC_MSG_RESULT(yes)
                    enable_fvisibility_hidden=yes,
                    AC_MSG_RESULT(no)
@@ -348,7 +348,7 @@ AC_ARG_ENABLE(Bsymbolic,
               [SAVED_LDFLAGS="${LDFLAGS}"
                AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
                LDFLAGS=-Wl,-Bsymbolic-functions
-               AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int main (void) { return 0; }]])],
+               AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return 0]])],
                               [AC_MSG_RESULT(yes)
                                enable_Bsymbolic=yes],
                               [AC_MSG_RESULT(no)

diff --git a/docs/g-ir-compiler.1 b/docs/g-ir-compiler.1
index 5c312b3..2828320 100644 (file)
--- a/docs/g-ir-compiler.1
+++ b/docs/g-ir-compiler.1
@@ -30,8 +30,7 @@ FIXME
 .TP
 .B \--shared-library=FILENAME
 Specifies the shared library where the symbols in the typelib can be found.
-The name of the library should not contain the leading lib prefix nor
-the ending shared library suffix.
+The name of the library should not contain the ending shared library suffix.
 .TP
 .SH BUGS
 Report bugs at http://bugzilla.gnome.org/ in the gobject-introspection product.

diff --git a/docs/g-ir-scanner.1 b/docs/g-ir-scanner.1
index 2fbc1d6..f027fdb 100644 (file)
--- a/docs/g-ir-scanner.1
+++ b/docs/g-ir-scanner.1
@@ -140,6 +140,10 @@ not write cache data to $HOME.
 The variable GI_SCANNER_DEBUG can be used to debug issues in the build-system that
 involve g-ir-scanner. When it is set to 'save-temps', then g-ir-scanner will not remove
 temporary files and directories after it terminates.
+
+The variable GI_HOST_OS can be used to control the OS name on the
+host that runs the scanner. It has the same semantics as the Python
+os.name property.
 .SH BUGS
 Report bugs at http://bugzilla.gnome.org/ in the gobject-introspection product.
 .SH HOMEPAGE and CONTACT

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 332bd70..994b114 100644 (file)
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -60,7 +60,7 @@ IGNORE_HFILES=                                                \
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
 HTML_IMAGES=                                           \
-    $(srcdir)/images/overview.png
+    images/overview.png
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml

diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in
index b8bfcd4..803bda5 100644 (file)
--- a/docs/reference/Makefile.in
+++ b/docs/reference/Makefile.in
@@ -390,7 +390,7 @@ IGNORE_HFILES = \
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
 HTML_IMAGES = \
-    $(srcdir)/images/overview.png
+    images/overview.png
 
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).

diff --git a/docs/reference/html/GIRepository.html b/docs/reference/html/GIRepository.html
index cd66b9a..b7c21ec 100644 (file)
--- a/docs/reference/html/GIRepository.html
+++ b/docs/reference/html/GIRepository.html
@@ -272,6 +272,14 @@
 <a name="GIRepository.description"></a><h2>Description</h2>
 <p><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> is used to manage repositories of namespaces. Namespaces
 are represented on disk by type libraries (.typelib files).</p>
+<p>### Discovery of type libraries</p>
+<p><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> will typically look for a <code class="literal">girepository-1.0</code> directory
+under the library directory used when compiling gobject-introspection.</p>
+<p>It is possible to control the search paths programmatically, using
+<a class="link" href="GIRepository.html#g-irepository-prepend-search-path" title="g_irepository_prepend_search_path ()"><code class="function">g_irepository_prepend_search_path()</code></a>. It is also possible to modify
+the search paths by using the <code class="literal">GI_TYPELIB_PATH</code> environment variable.
+The environment variable takes precedence over the default search path
+and the <a class="link" href="GIRepository.html#g-irepository-prepend-search-path" title="g_irepository_prepend_search_path ()"><code class="function">g_irepository_prepend_search_path()</code></a> calls.</p>
 </div>
 <div class="refsect1">
 <a name="GIRepository.functions_details"></a><h2>Functions</h2>
@@ -593,8 +601,8 @@ See the documentation of your dynamic linker for full details.</p>
 <pre class="programlisting"><span class="returnvalue">void</span>
 g_irepository_prepend_search_path (<em class="parameter"><code>const <span class="type">char</span> *directory</code></em>);</pre>
 <p>Prepends <em class="parameter"><code>directory</code></em>
- to the typelib search path.
-See <a class="link" href="GIRepository.html#g-irepository-get-search-path" title="g_irepository_get_search_path ()"><code class="function">g_irepository_get_search_path()</code></a>.</p>
+ to the typelib search path.</p>
+<p>See also: <a class="link" href="GIRepository.html#g-irepository-get-search-path" title="g_irepository_get_search_path ()"><code class="function">g_irepository_get_search_path()</code></a>.</p>
 <div class="refsect3">
 <a name="g-irepository-prepend-search-path.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1187,6 +1195,7 @@ gi_cclosure_marshal_generic (<em class="parameter"><code><span class="type">GClo
                              <em class="parameter"><code><span class="type">gpointer</span> invocation_hint</code></em>,
                              <em class="parameter"><code><span class="type">gpointer</span> marshal_data</code></em>);</pre>
 <p>TODO</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
 <a name="gi-cclosure-marshal-generic.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">

diff --git a/docs/reference/html/gi-GIUnionInfo.html b/docs/reference/html/gi-GIUnionInfo.html
index 96c67b7..7a691e0 100644 (file)
--- a/docs/reference/html/gi-GIUnionInfo.html
+++ b/docs/reference/html/gi-GIUnionInfo.html
@@ -332,8 +332,7 @@ g_union_info_get_discriminator_offset (<em class="parameter"><code><a class="lin
 </div>
 <div class="refsect3">
 <a name="g-union-info-get-discriminator-offset.returns"></a><h4>Returns</h4>
-<p>offset in bytes of the discriminator. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<p> offset in bytes of the discriminator</p>
 </div>
 </div>
 <hr>

diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html
index c869eb9..47c2f87 100644 (file)
--- a/docs/reference/html/index.html
+++ b/docs/reference/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GObject Introspection Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      This document is for GObject Introspection version 1.55.1
+      This document is for GObject Introspection version 1.55.2
 .
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="http://developer.gnome.org/gi/unstable/" target="_top">http://developer.gnome.org/gi/unstable/</a>.

diff --git a/docs/reference/version.xml b/docs/reference/version.xml
index 6570a6d..536ec6a 100644 (file)
--- a/docs/reference/version.xml
+++ b/docs/reference/version.xml
@@ -1 +1 @@
-1.55.1
+1.55.2

diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index ecdb2cf..11b07ce 100644 (file)
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -2366,13 +2366,9 @@
 /**
  * GNetworkMonitor::network-changed:
  * @monitor: a #GNetworkMonitor
- * @available: the current value of #GNetworkMonitor:network-available
+ * @network_available: the current value of #GNetworkMonitor:network-available
  *
- * Emitted when the network configuration changes. If @available is
- * %TRUE, then some hosts may be reachable that were not reachable
- * before, while others that were reachable before may no longer be
- * reachable. If @available is %FALSE, then no remote hosts are
- * reachable.
+ * Emitted when the network configuration changes.
  *
  * Since: 2.32
  */
@@ -3567,18 +3563,20 @@
 /**
  * GTlsClientConnection:use-ssl3:
  *
- * If %TRUE, tells the connection to use a fallback version of TLS
+ * If %TRUE, forces the connection to use a fallback version of TLS
  * or SSL, rather than trying to negotiate the best version of TLS
  * to use. This can be used when talking to servers that don't
  * implement version negotiation correctly and therefore refuse to
- * handshake at all with a "modern" TLS handshake.
+ * handshake at all with a modern TLS handshake.
  *
- * Despite the property name, the fallback version is not
- * necessarily SSL 3.0; if SSL 3.0 has been disabled, the
- * #GTlsClientConnection will use the next highest available version
- * (normally TLS 1.0) as the fallback version.
+ * Despite the property name, the fallback version is usually not
+ * SSL 3.0, because SSL 3.0 is generally disabled by the #GTlsBackend.
+ * #GTlsClientConnection will use the next-highest available version
+ * as the fallback version.
  *
  * Since: 2.28
+ * Deprecated: 2.56: SSL 3.0 is insecure, and this property does not
+ * generally enable or disable it, despite its name.
  */
 
 
@@ -5819,6 +5817,9 @@
  * like `unix:tmpdir=/tmp/my-app-name`. The exact format of addresses
  * is explained in detail in the
  * [D-Bus specification](http://dbus.freedesktop.org/doc/dbus-specification.html#addresses).
+ *
+ * TCP D-Bus connections are supported, but accessing them via a proxy is
+ * currently not supported.
  */
 
 
@@ -6274,7 +6275,7 @@
  * both well-known and unique names.
  *
  * By default, #GDBusProxy will cache all properties (and listen to
- * changes) of the remote object, and proxy all signals that gets
+ * changes) of the remote object, and proxy all signals that get
  * emitted. This behaviour can be changed by passing suitable
  * #GDBusProxyFlags when the proxy is created. If the proxy is for a
  * well-known name, the property cache is flushed when the name owner
@@ -7973,7 +7974,7 @@
  * that describes the keys in your settings and their types and default
  * values, as well as some other information.
  *
- * Normally, a schema has as fixed path that determines where the settings
+ * Normally, a schema has a fixed path that determines where the settings
  * are stored in the conceptual global tree of settings. However, schemas
  * can also be '[relocatable][gsettings-relocatable]', i.e. not equipped with
  * a fixed path. This is
@@ -16044,6 +16045,8 @@
  *     before encountering any of the stop characters. Set @length to
  *     a #gsize to get the length of the string. This function will
  *     return %NULL on an error.
+ * Deprecated: 2.56: Use g_data_input_stream_read_upto() instead, which has more
+ *     consistent behaviour regarding the stop character.
  */
 
 
@@ -16073,6 +16076,8 @@
  * g_data_input_stream_read_upto_async() instead.
  *
  * Since: 2.20
+ * Deprecated: 2.56: Use g_data_input_stream_read_upto_async() instead, which
+ *     has more consistent behaviour regarding the stop character.
  */
 
 
@@ -16091,6 +16096,8 @@
  *     before encountering any of the stop characters. Set @length to
  *     a #gsize to get the length of the string. This function will
  *     return %NULL on an error.
+ * Deprecated: 2.56: Use g_data_input_stream_read_upto_finish() instead, which
+ *     has more consistent behaviour regarding the stop character.
  */
 
 
@@ -16826,7 +16833,8 @@
  * @method_name: the name of the method to invoke
  * @parameters: (nullable): a #GVariant tuple with parameters for the method
  *     or %NULL if not passing parameters
- * @reply_type: (nullable): the expected type of the reply, or %NULL
+ * @reply_type: (nullable): the expected type of the reply (which will be a
+ *     tuple), or %NULL
  * @flags: flags from the #GDBusCallFlags enumeration
  * @timeout_msec: the timeout in milliseconds, -1 to use the default
  *     timeout or %G_MAXINT for no timeout
@@ -16848,7 +16856,9 @@
  *
  * If @reply_type is non-%NULL then the reply will be checked for having this type and an
  * error will be raised if it does not match.  Said another way, if you give a @reply_type
- * then any non-%NULL return value will be of this type.
+ * then any non-%NULL return value will be of this type. Unless it’s
+ * %G_VARIANT_TYPE_UNIT, the @reply_type will be a tuple containing one or more
+ * values.
  *
  * If the @parameters #GVariant is floating, it is consumed. This allows
  * convenient 'inline' use of g_variant_new(), e.g.:
@@ -17115,7 +17125,9 @@
  *
  * If the parameters GVariant is floating, it is consumed.
  *
- * This can only fail if @parameters is not compatible with the D-Bus protocol.
+ * This can only fail if @parameters is not compatible with the D-Bus protocol
+ * (%G_IO_ERROR_INVALID_ARGUMENT), or if @connection has been closed
+ * (%G_IO_ERROR_CLOSED).
  *
  * Returns: %TRUE unless @error is set
  * Since: 2.26
@@ -18417,7 +18429,7 @@
  *
  * For example, an exported D-Bus interface may queue up property
  * changes and emit the
- * `org.freedesktop.DBus.Properties::PropertiesChanged`
+ * `org.freedesktop.DBus.Properties.PropertiesChanged`
  * signal later (e.g. in an idle handler). This technique is useful
  * for collapsing multiple property changes into one.
  *
@@ -19602,7 +19614,7 @@
  *   g_dbus_method_invocation_return_value (invocation,
  *                                          g_variant_new ("(s)", result_string));
  *
- * /<!-- -->* Do not free @invocation here; returning a value does that *<!-- -->/
+ * // Do not free @invocation here; returning a value does that
  * ]|
  *
  * This method will take ownership of @invocation. See
@@ -20427,9 +20439,9 @@
  * #GDBusProxy:g-interface-info) and @property_name is referenced by
  * it, then @value is checked against the type of the property.
  *
- * Returns: A reference to the #GVariant instance that holds the value
- * for @property_name or %NULL if the value is not in the cache. The
- * returned reference must be freed with g_variant_unref().
+ * Returns: (transfer full) (nullable): A reference to the #GVariant instance
+ *    that holds the value for @property_name or %NULL if the value is not in
+ *    the cache. The returned reference must be freed with g_variant_unref().
  * Since: 2.26
  */
 
@@ -20440,7 +20452,8 @@
  *
  * Gets the names of all cached properties on @proxy.
  *
- * Returns: (transfer full): A %NULL-terminated array of strings or %NULL if
+ * Returns: (transfer full) (nullable) (array zero-terminated=1): A
+ *          %NULL-terminated array of strings or %NULL if
  *          @proxy has no cached properties. Free the returned array with
  *          g_strfreev().
  * Since: 2.26
@@ -20492,8 +20505,8 @@
  * that @proxy conforms to. See the #GDBusProxy:g-interface-info
  * property for more details.
  *
- * Returns: A #GDBusInterfaceInfo or %NULL. Do not unref the returned
- * object, it is owned by @proxy.
+ * Returns: (transfer none) (nullable): A #GDBusInterfaceInfo or %NULL.
+ *    Do not unref the returned object, it is owned by @proxy.
  * Since: 2.26
  */
 
@@ -20529,7 +20542,8 @@
  * #GObject::notify signal to track changes to the
  * #GDBusProxy:g-name-owner property.
  *
- * Returns: The name owner or %NULL if no name owner exists. Free with g_free().
+ * Returns: (transfer full) (nullable): The name owner or %NULL if no name
+ *    owner exists. Free with g_free().
  * Since: 2.26
  */
 
@@ -20592,7 +20606,8 @@
  *
  * Finishes creating a #GDBusProxy.
  *
- * Returns: A #GDBusProxy or %NULL if @error is set. Free with g_object_unref().
+ * Returns: (transfer full): A #GDBusProxy or %NULL if @error is set.
+ *    Free with g_object_unref().
  * Since: 2.26
  */
 
@@ -20624,7 +20639,8 @@
  *
  * Finishes creating a #GDBusProxy.
  *
- * Returns: A #GDBusProxy or %NULL if @error is set. Free with g_object_unref().
+ * Returns: (transfer full): A #GDBusProxy or %NULL if @error is set.
+ *    Free with g_object_unref().
  * Since: 2.26
  */
 
@@ -20645,7 +20661,8 @@
  *
  * #GDBusProxy is used in this [example][gdbus-wellknown-proxy].
  *
- * Returns: A #GDBusProxy or %NULL if error is set. Free with g_object_unref().
+ * Returns: (transfer full): A #GDBusProxy or %NULL if error is set.
+ *    Free with g_object_unref().
  * Since: 2.26
  */
 
@@ -20680,7 +20697,8 @@
  *
  * #GDBusProxy is used in this [example][gdbus-wellknown-proxy].
  *
- * Returns: A #GDBusProxy or %NULL if error is set. Free with g_object_unref().
+ * Returns: (transfer full): A #GDBusProxy or %NULL if error is set.
+ *    Free with g_object_unref().
  * Since: 2.26
  */
 
@@ -20747,7 +20765,8 @@
 /**
  * g_dbus_proxy_set_interface_info:
  * @proxy: A #GDBusProxy
- * @info: (nullable): Minimum interface this proxy conforms to or %NULL to unset.
+ * @info: (transfer none) (nullable): Minimum interface this proxy conforms to
+ *    or %NULL to unset.
  *
  * Ensure that interactions with @proxy conform to the given
  * interface. See the #GDBusProxy:g-interface-info property for more
@@ -25345,6 +25364,24 @@
 
 
 /**
+ * g_file_peek_path:
+ * @file: input #GFile
+ *
+ * Exactly like g_file_get_path(), but caches the result via
+ * g_object_set_qdata_full().  This is useful for example in C
+ * applications which mix `g_file_*` APIs with native ones.  It
+ * also avoids an extra duplicated string when possible, so will be
+ * generally more efficient.
+ *
+ * This call does no blocking I/O.
+ *
+ * Returns: (type filename) (nullable): string containing the #GFile's path,
+ *     or %NULL if no such path exists. The returned string is owned by @file.
+ * Since: 2.56
+ */
+
+
+/**
  * g_file_poll_mountable:
  * @file: input #GFile
  * @cancellable: optional #GCancellable object, %NULL to ignore
@@ -25411,7 +25448,7 @@
  * Utility function to check if a particular file exists. This is
  * implemented using g_file_query_info() and as such does blocking I/O.
  *
- * Note that in many cases it is racy to first check for file existence
+ * Note that in many cases it is [racy to first check for file existence](https://en.wikipedia.org/wiki/Time_of_check_to_time_of_use)
  * and then execute something based on the outcome of that, because the
  * file might have been created or removed in between the operations. The
  * general approach to handling that is to not check, but just do the
@@ -30911,6 +30948,8 @@
  * Deprecated in favor of g_notification_set_priority().
  *
  * Since: 2.40
+ * Deprecated: 2.42: Since 2.42, this has been deprecated in favour of
+ *    g_notification_set_priority().
  */
 
 
@@ -31798,6 +31837,9 @@
  * may happen if you call this method after a source triggers due
  * to having been cancelled.
  *
+ * Also note that if %G_IO_ERROR_WOULD_BLOCK is returned some underlying
+ * transports like D/TLS require that you send the same @buffer and @count.
+ *
  * Returns: the number of bytes written, or -1 on error (including
  *   %G_IO_ERROR_WOULD_BLOCK).
  */
@@ -33688,7 +33730,7 @@
 /**
  * g_settings_list_relocatable_schemas:
  *
- * <!-- -->
+ * Deprecated.
  *
  * Returns: (element-type utf8) (transfer none): a list of relocatable
  *   #GSettings schemas that are available.  The list must not be
@@ -33701,7 +33743,7 @@
 /**
  * g_settings_list_schemas:
  *
- * <!-- -->
+ * Deprecated.
  *
  * Returns: (element-type utf8) (transfer none): a list of #GSettings
  *   schemas that are available.  The list must not be modified or
@@ -37940,8 +37982,8 @@
  * @subprocess: a #GSubprocess
  * @stdin_buf: (nullable): data to send to the stdin of the subprocess, or %NULL
  * @cancellable: a #GCancellable
- * @stdout_buf: (out): data read from the subprocess stdout
- * @stderr_buf: (out): data read from the subprocess stderr
+ * @stdout_buf: (out) (nullable) (optional) (transfer full): data read from the subprocess stdout
+ * @stderr_buf: (out) (nullable) (optional) (transfer full): data read from the subprocess stderr
  * @error: a pointer to a %NULL #GError pointer, or %NULL
  *
  * Communicate with the subprocess until it terminates, and all input
@@ -38008,8 +38050,8 @@
  * g_subprocess_communicate_finish:
  * @subprocess: Self
  * @result: Result
- * @stdout_buf: (out): Return location for stdout data
- * @stderr_buf: (out): Return location for stderr data
+ * @stdout_buf: (out) (nullable) (optional) (transfer full): Return location for stdout data
+ * @stderr_buf: (out) (nullable) (optional) (transfer full): Return location for stderr data
  * @error: Error
  *
  * Complete an invocation of g_subprocess_communicate_async().
@@ -38021,8 +38063,8 @@
  * @subprocess: a #GSubprocess
  * @stdin_buf: (nullable): data to send to the stdin of the subprocess, or %NULL
  * @cancellable: a #GCancellable
- * @stdout_buf: (out): data read from the subprocess stdout
- * @stderr_buf: (out): data read from the subprocess stderr
+ * @stdout_buf: (out) (nullable) (optional) (transfer full): data read from the subprocess stdout
+ * @stderr_buf: (out) (nullable) (optional) (transfer full): data read from the subprocess stderr
  * @error: a pointer to a %NULL #GError pointer, or %NULL
  *
  * Like g_subprocess_communicate(), but validates the output of the
@@ -38047,8 +38089,8 @@
  * g_subprocess_communicate_utf8_finish:
  * @subprocess: Self
  * @result: Result
- * @stdout_buf: (out): Return location for stdout data
- * @stderr_buf: (out): Return location for stderr data
+ * @stdout_buf: (out) (nullable) (optional) (transfer full): Return location for stdout data
+ * @stderr_buf: (out) (nullable) (optional) (transfer full): Return location for stderr data
  * @error: Error
  *
  * Complete an invocation of g_subprocess_communicate_utf8_async().
@@ -39853,12 +39895,14 @@
  * g_tls_client_connection_get_use_ssl3:
  * @conn: the #GTlsClientConnection
  *
- * Gets whether @conn will use SSL 3.0 rather than the
- * highest-supported version of TLS; see
- * g_tls_client_connection_set_use_ssl3().
+ * Gets whether @conn will force the lowest-supported TLS protocol
+ * version rather than attempt to negotiate the highest mutually-
+ * supported version of TLS; see g_tls_client_connection_set_use_ssl3().
  *
- * Returns: whether @conn will use SSL 3.0
+ * Returns: whether @conn will use the lowest-supported TLS protocol version
  * Since: 2.28
+ * Deprecated: 2.56: SSL 3.0 is insecure, and this function does not
+ * actually indicate whether it is enabled.
  */
 
 
@@ -39910,15 +39954,20 @@
 /**
  * g_tls_client_connection_set_use_ssl3:
  * @conn: the #GTlsClientConnection
- * @use_ssl3: whether to use SSL 3.0
+ * @use_ssl3: whether to use the lowest-supported protocol version
+ *
+ * If @use_ssl3 is %TRUE, this forces @conn to use the lowest-supported
+ * TLS protocol version rather than trying to properly negotiate the
+ * highest mutually-supported protocol version with the peer. This can
+ * be used when talking to broken TLS servers that exhibit protocol
+ * version intolerance.
  *
- * If @use_ssl3 is %TRUE, this forces @conn to use SSL 3.0 rather than
- * trying to properly negotiate the right version of TLS or SSL to use.
- * This can be used when talking to servers that do not implement the
- * fallbacks correctly and which will therefore fail to handshake with
- * a "modern" TLS handshake attempt.
+ * Be aware that SSL 3.0 is generally disabled by the #GTlsBackend, so
+ * the lowest-supported protocol version is probably not SSL 3.0.
  *
  * Since: 2.28
+ * Deprecated: 2.56: SSL 3.0 is insecure, and this function does not
+ * generally enable or disable it, despite its name.
  */
 
 

diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 854cee1..98c2f02 100644 (file)
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -593,7 +593,7 @@
  * g_direct_hash() is also the appropriate hash function for keys
  * of the form `GINT_TO_POINTER (n)` (or similar macros).
  *
- * <!-- FIXME: Need more here. --> A good hash functions should produce
+ * A good hash functions should produce
  * hash values that are evenly distributed over a fairly large range.
  * The modulus is taken with the hash table size (a prime number) to
  * find the 'bucket' to place each key into. The function should also
@@ -5443,7 +5443,7 @@
  * in it ("/"). However, displaying file names may require conversion:
  * from the character set in which they were created, to the character
  * set in which the application operates. Consider the Spanish file name
- * "Presentaci&oacute;n.sxi". If the application which created it uses
+ * "Presentación.sxi". If the application which created it uses
  * ISO-8859-1 for its encoding,
  * |[
  * Character:  P  r  e  s  e  n  t  a  c  i  ó  n  .  s  x  i
@@ -5456,31 +5456,31 @@
  * Hex code:   50 72 65 73 65 6e 74 61 63 69 c3 b3 6e 2e 73 78 69
  * ]|
  * Glib uses UTF-8 for its strings, and GUI toolkits like GTK+ that use
- * Glib do the same thing. If you get a file name from the file system,
+ * GLib do the same thing. If you get a file name from the file system,
  * for example, from readdir() or from g_dir_read_name(), and you wish
  * to display the file name to the user, you  will need to convert it
  * into UTF-8. The opposite case is when the user types the name of a
- * file he wishes to save: the toolkit will give you that string in
+ * file they wish to save: the toolkit will give you that string in
  * UTF-8 encoding, and you will need to convert it to the character
  * set used for file names before you can create the file with open()
  * or fopen().
  *
- * By default, Glib assumes that file names on disk are in UTF-8
+ * By default, GLib assumes that file names on disk are in UTF-8
  * encoding. This is a valid assumption for file systems which
  * were created relatively recently: most applications use UTF-8
  * encoding for their strings, and that is also what they use for
  * the file names they create. However, older file systems may
  * still contain file names created in "older" encodings, such as
  * ISO-8859-1. In this case, for compatibility reasons, you may want
- * to instruct Glib to use that particular encoding for file names
+ * to instruct GLib to use that particular encoding for file names
  * rather than UTF-8. You can do this by specifying the encoding for
  * file names in the [`G_FILENAME_ENCODING`][G_FILENAME_ENCODING]
  * environment variable. For example, if your installation uses
- * ISO-8859-1 for file names, you can put this in your `~/.profile`
+ * ISO-8859-1 for file names, you can put this in your `~/.profile`:
  * |[
  * export G_FILENAME_ENCODING=ISO-8859-1
  * ]|
- * Glib provides the functions g_filename_to_utf8() and
+ * GLib provides the functions g_filename_to_utf8() and
  * g_filename_from_utf8() to perform the necessary conversions.
  * These functions convert file names from the encoding specified
  * in `G_FILENAME_ENCODING` to UTF-8 and vice-versa. This
@@ -7235,8 +7235,13 @@
  *
  * These functions provide support for allocating and freeing memory.
  *
- * If any call to allocate memory fails, the application is terminated.
- * This also means that there is no need to check if the call succeeded.
+ * If any call to allocate memory using functions g_new(), g_new0(), g_renew(),
+ * g_malloc(), g_malloc0(), g_malloc0_n(), g_realloc(), and g_realloc_n()
+ * fails, the application is terminated. This also means that there is no
+ * need to check if the call succeeded. On the other hand, g_try_...() family
+ * of functions returns %NULL on failure that can be used as a check
+ * for unsuccessful memory allocation. The application is not terminated
+ * in this case.
  *
  * It's important to match g_malloc() (and wrappers such as g_new()) with
  * g_free(), g_slice_alloc() (and wrappers such as g_slice_new()) with
@@ -7836,6 +7841,12 @@
  * g_sequence_move_range() will not invalidate the iterators pointing
  * to it. The only operation that will invalidate an iterator is when
  * the element it points to is removed from any sequence.
+ *
+ * To sort the data, either use g_sequence_insert_sorted() or
+ * g_sequence_insert_sorted_iter() to add data to the #GSequence or, if
+ * you want to add a large amount of data, it is more efficient to call
+ * g_sequence_sort() or g_sequence_sort_iter() after doing unsorted
+ * insertions.
  */
 
 
@@ -10606,9 +10617,9 @@
  *
  *   membuf = g_malloc (8192);
  *
- *   /<!-- -->* Some computation on membuf *<!-- -->/
+ *   // Some computation on membuf
  *
- *   /<!-- -->* membuf will be automatically freed here *<!-- -->/
+ *   // membuf will be automatically freed here
  *   return TRUE;
  * }
  * ]|
@@ -12096,6 +12107,12 @@
  * A reference to @bytes will be held by the newly created #GBytes until
  * the byte data is no longer needed.
  *
+ * Since 2.56, if @offset is 0 and @length matches the size of @bytes, then
+ * @bytes will be returned with the reference count incremented by 1. If @bytes
+ * is a slice of another #GBytes, then the resulting #GBytes will reference
+ * the same #GBytes instead of @bytes. This allows consumers to simplify the
+ * usage of #GBytes when asynchronously writing to streams.
+ *
  * Returns: (transfer full): a new #GBytes
  * Since: 2.32
  */
@@ -12813,30 +12830,31 @@
 
 /**
  * g_convert:
- * @str: the string to convert
+ * @str: (array length=len) (element-type guint8):
+ *                 the string to convert.
  * @len: the length of the string in bytes, or -1 if the string is
  *                 nul-terminated (Note that some encodings may allow nul
  *                 bytes to occur inside strings. In that case, using -1
  *                 for the @len parameter is unsafe)
  * @to_codeset: name of character set into which to convert @str
  * @from_codeset: character set of @str.
- * @bytes_read: (out): location to store the number of bytes in the
- *                 input string that were successfully converted, or %NULL.
+ * @bytes_read: (out) (optional): location to store the number of bytes in
+ *                 the input string that were successfully converted, or %NULL.
  *                 Even if the conversion was successful, this may be
  *                 less than @len if there were partial characters
  *                 at the end of the input. If the error
  *                 #G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value
- *                 stored will the byte offset after the last valid
+ *                 stored will be the byte offset after the last valid
  *                 input sequence.
- * @bytes_written: (out): the number of bytes stored in the output buffer (not
- *                 including the terminating nul).
+ * @bytes_written: (out) (optional): the number of bytes stored in
+ *                 the output buffer (not including the terminating nul).
  * @error: location to store the error occurring, or %NULL to ignore
  *                 errors. Any of the errors in #GConvertError may occur.
  *
  * Converts a string from one character set to another.
  *
  * Note that you should use g_iconv() for streaming conversions.
- * Despite the fact that @byes_read can return information about partial
+ * Despite the fact that @bytes_read can return information about partial
  * characters, the g_convert_... functions are not generally suitable
  * for streaming. If the underlying converter maintains internal state,
  * then this won't be preserved across successive calls to g_convert(),
@@ -12848,33 +12866,35 @@
  * Using extensions such as "//TRANSLIT" may not work (or may not work
  * well) on many platforms.  Consider using g_str_to_ascii() instead.
  *
- * Returns: If the conversion was successful, a newly allocated
- *               nul-terminated string, which must be freed with
- *               g_free(). Otherwise %NULL and @error will be set.
+ * Returns: (array length=bytes_written) (element-type guint8) (transfer full):
+ *          If the conversion was successful, a newly allocated buffer
+ *          containing the converted string, which must be freed with g_free().
+ *          Otherwise %NULL and @error will be set.
  */
 
 
 /**
  * g_convert_with_fallback:
- * @str: the string to convert
+ * @str: (array length=len) (element-type guint8):
+ *                the string to convert.
  * @len: the length of the string in bytes, or -1 if the string is
  *                 nul-terminated (Note that some encodings may allow nul
  *                 bytes to occur inside strings. In that case, using -1
  *                 for the @len parameter is unsafe)
  * @to_codeset: name of character set into which to convert @str
  * @from_codeset: character set of @str.
- * @fallback: UTF-8 string to use in place of character not
+ * @fallback: UTF-8 string to use in place of characters not
  *                present in the target encoding. (The string must be
  *                representable in the target encoding).
  *                If %NULL, characters not in the target encoding will
  *                be represented as Unicode escapes \uxxxx or \Uxxxxyyyy.
- * @bytes_read: location to store the number of bytes in the
- *                input string that were successfully converted, or %NULL.
+ * @bytes_read: (out) (optional): location to store the number of bytes in
+ *                the input string that were successfully converted, or %NULL.
  *                Even if the conversion was successful, this may be
  *                less than @len if there were partial characters
  *                at the end of the input.
- * @bytes_written: the number of bytes stored in the output buffer (not
- *                including the terminating nul).
+ * @bytes_written: (out) (optional): the number of bytes stored in
+ *                 the output buffer (not including the terminating nul).
  * @error: location to store the error occurring, or %NULL to ignore
  *                errors. Any of the errors in #GConvertError may occur.
  *
@@ -12887,7 +12907,7 @@
  * in which case GLib will simply return that approximate conversion.
  *
  * Note that you should use g_iconv() for streaming conversions.
- * Despite the fact that @byes_read can return information about partial
+ * Despite the fact that @bytes_read can return information about partial
  * characters, the g_convert_... functions are not generally suitable
  * for streaming. If the underlying converter maintains internal state,
  * then this won't be preserved across successive calls to g_convert(),
@@ -12896,37 +12916,39 @@
  * character until it knows that the next character is not a mark that
  * could combine with the base character.)
  *
- * Returns: If the conversion was successful, a newly allocated
- *               nul-terminated string, which must be freed with
- *               g_free(). Otherwise %NULL and @error will be set.
+ * Returns: (array length=bytes_written) (element-type guint8) (transfer full):
+ *          If the conversion was successful, a newly allocated buffer
+ *          containing the converted string, which must be freed with g_free().
+ *          Otherwise %NULL and @error will be set.
  */
 
 
 /**
  * g_convert_with_iconv: (skip)
- * @str: the string to convert
+ * @str: (array length=len) (element-type guint8):
+ *                 the string to convert.
  * @len: the length of the string in bytes, or -1 if the string is
  *                 nul-terminated (Note that some encodings may allow nul
  *                 bytes to occur inside strings. In that case, using -1
  *                 for the @len parameter is unsafe)
  * @converter: conversion descriptor from g_iconv_open()
- * @bytes_read: location to store the number of bytes in the
- *                 input string that were successfully converted, or %NULL.
+ * @bytes_read: (out) (optional): location to store the number of bytes in
+ *                 the input string that were successfully converted, or %NULL.
  *                 Even if the conversion was successful, this may be
  *                 less than @len if there were partial characters
  *                 at the end of the input. If the error
  *                 #G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value
- *                 stored will the byte offset after the last valid
+ *                 stored will be the byte offset after the last valid
  *                 input sequence.
- * @bytes_written: the number of bytes stored in the output buffer (not
- *                 including the terminating nul).
+ * @bytes_written: (out) (optional): the number of bytes stored in
+ *                 the output buffer (not including the terminating nul).
  * @error: location to store the error occurring, or %NULL to ignore
  *                 errors. Any of the errors in #GConvertError may occur.
  *
  * Converts a string from one character set to another.
  *
  * Note that you should use g_iconv() for streaming conversions.
- * Despite the fact that @byes_read can return information about partial
+ * Despite the fact that @bytes_read can return information about partial
  * characters, the g_convert_... functions are not generally suitable
  * for streaming. If the underlying converter maintains internal state,
  * then this won't be preserved across successive calls to g_convert(),
@@ -12935,8 +12957,17 @@
  * character until it knows that the next character is not a mark that
  * could combine with the base character.)
  *
- * Returns: If the conversion was successful, a newly allocated
- *               nul-terminated string, which must be freed with
+ * Characters which are valid in the input character set, but which have no
+ * representation in the output character set will result in a
+ * %G_CONVERT_ERROR_ILLEGAL_SEQUENCE error. This is in contrast to the iconv()
+ * specification, which leaves this behaviour implementation defined. Note that
+ * this is the same error code as is returned for an invalid byte sequence in
+ * the input character set. To get defined behaviour for conversion of
+ * unrepresentable characters, use g_convert_with_fallback().
+ *
+ * Returns: (array length=bytes_written) (element-type guint8) (transfer full):
+ *               If the conversion was successful, a newly allocated buffer
+ *               containing the converted string, which must be freed with
  *               g_free(). Otherwise %NULL and @error will be set.
  */
 
@@ -13144,7 +13175,7 @@
  *
  * If the previous value was replaced then ownership of the
  * old value (@oldval) is passed to the caller, including
- * the registred destroy notify for it (passed out in @old_destroy).
+ * the registered destroy notify for it (passed out in @old_destroy).
  * Its up to the caller to free this as he wishes, which may
  * or may not include using @old_destroy as sometimes replacement
  * should not destroy the object in the normal way.
@@ -15668,7 +15699,7 @@
 
 /**
  * g_filename_from_utf8:
- * @utf8string: a UTF-8 encoded string.
+ * @utf8string: (type utf8): a UTF-8 encoded string.
  * @len: the length of the string, or -1 if the string is
  *                 nul-terminated.
  * @bytes_read: (out) (optional): location to store the number of bytes in
@@ -15676,11 +15707,11 @@
  *                 Even if the conversion was successful, this may be
  *                 less than @len if there were partial characters
  *                 at the end of the input. If the error
- *                 #G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value
- *                 stored will the byte offset after the last valid
+ *                 %G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value
+ *                 stored will be the byte offset after the last valid
  *                 input sequence.
- * @bytes_written: (out): the number of bytes stored in the output buffer (not
- *                 including the terminating nul).
+ * @bytes_written: (out) (optional): the number of bytes stored in
+ *                 the output buffer (not including the terminating nul).
  * @error: location to store the error occurring, or %NULL to ignore
  *                 errors. Any of the errors in #GConvertError may occur.
  *
@@ -15689,7 +15720,13 @@
  * on other platforms, this function indirectly depends on the
  * [current locale][setlocale].
  *
- * Returns: (array length=bytes_written) (element-type guint8) (transfer full):
+ * The input string shall not contain nul characters even if the @len
+ * argument is positive. A nul character found inside the string will result
+ * in error %G_CONVERT_ERROR_ILLEGAL_SEQUENCE. If the filename encoding is
+ * not UTF-8 and the conversion output contains a nul character, the error
+ * %G_CONVERT_ERROR_EMBEDDED_NUL is set and the function returns %NULL.
+ *
+ * Returns: (type filename):
  *               The converted string, or %NULL on an error.
  */
 
@@ -15723,8 +15760,8 @@
  *                 Even if the conversion was successful, this may be
  *                 less than @len if there were partial characters
  *                 at the end of the input. If the error
- *                 #G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value
- *                 stored will the byte offset after the last valid
+ *                 %G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value
+ *                 stored will be the byte offset after the last valid
  *                 input sequence.
  * @bytes_written: (out) (optional): the number of bytes stored in the output
  *                 buffer (not including the terminating nul).
@@ -15736,7 +15773,15 @@
  * for filenames; on other platforms, this function indirectly depends on
  * the [current locale][setlocale].
  *
- * Returns: The converted string, or %NULL on an error.
+ * The input string shall not contain nul characters even if the @len
+ * argument is positive. A nul character found inside the string will result
+ * in error %G_CONVERT_ERROR_ILLEGAL_SEQUENCE.
+ * If the source encoding is not UTF-8 and the conversion output contains a
+ * nul character, the error %G_CONVERT_ERROR_EMBEDDED_NUL is set and the
+ * function returns %NULL. Use g_convert() to produce output that
+ * may contain embedded nul characters.
+ *
+ * Returns: (type utf8): The converted string, or %NULL on an error.
  */
 
 
@@ -15929,6 +15974,10 @@
  * handle file names. It might be different from the character set
  * used by the C library's current locale.
  *
+ * On Linux, the character set is found by consulting nl_langinfo() if
+ * available. If not, the environment variables `LC_ALL`, `LC_CTYPE`, `LANG`
+ * and `CHARSET` are queried in order.
+ *
  * The return value is %TRUE if the locale's encoding is UTF-8, in that
  * case you can perhaps avoid calling g_convert().
  *
@@ -15999,7 +16048,8 @@
 
 /**
  * g_get_filename_charsets:
- * @charsets: return location for the %NULL-terminated list of encoding names
+ * @filename_charsets: (out) (transfer none) (array zero-terminated=1):
+ *    return location for the %NULL-terminated list of encoding names
  *
  * Determines the preferred character sets used for filenames.
  * The first character set from the @charsets is the filename encoding, the
@@ -16454,6 +16504,10 @@
  * corresponding value it is able to be stored more efficiently.  See
  * the discussion in the section description.
  *
+ * Starting from GLib 2.40, this function returns a boolean value to
+ * indicate whether the newly added value was already in the hash table
+ * or not.
+ *
  * Returns: %TRUE if the key did not exist yet
  * Since: 2.32
  */
@@ -16657,6 +16711,10 @@
  * @key_destroy_func when creating the #GHashTable, the passed
  * key is freed using that function.
  *
+ * Starting from GLib 2.40, this function returns a boolean value to
+ * indicate whether the newly added value was already in the hash table
+ * or not.
+ *
  * Returns: %TRUE if the key did not exist yet
  */
 
@@ -16912,6 +16970,10 @@
  * If you supplied a @key_destroy_func when creating the
  * #GHashTable, the old key is freed using that function.
  *
+ * Starting from GLib 2.40, this function returns a boolean value to
+ * indicate whether the newly added value was already in the hash table
+ * or not.
+ *
  * Returns: %TRUE if the key did not exist yet
  */
 
@@ -17492,6 +17554,13 @@
  * GLib provides g_convert() and g_locale_to_utf8() which are likely
  * more convenient than the raw iconv wrappers.
  *
+ * Note that the behaviour of iconv() for characters which are valid in the
+ * input character set, but which have no representation in the output character
+ * set, is implementation defined. This function may return success (with a
+ * positive number of non-reversible conversions as replacement characters were
+ * used), or it may return -1 and set an error such as %EILSEQ, in such a
+ * situation.
+ *
  * Returns: count of non-reversible conversions, or -1 on error
  */
 
@@ -18603,6 +18672,29 @@
 
 
 /**
+ * g_key_file_get_locale_for_key:
+ * @key_file: a #GKeyFile
+ * @group_name: a group name
+ * @key: a key
+ * @locale: (nullable): a locale identifier or %NULL
+ *
+ * Returns the actual locale which the result of
+ * g_key_file_get_locale_string() or g_key_file_get_locale_string_list()
+ * came from.
+ *
+ * If calling g_key_file_get_locale_string() or
+ * g_key_file_get_locale_string_list() with exactly the same @key_file,
+ * @group_name, @key and @locale, the result of those functions will
+ * have originally been tagged with the locale that is the result of
+ * this function.
+ *
+ * Returns: (nullable): the locale from the file, or %NULL if the key was not
+ *   found or the entry in the file was was untranslated
+ * Since: 2.56
+ */
+
+
+/**
  * g_key_file_get_locale_string:
  * @key_file: a #GKeyFile
  * @group_name: a group name
@@ -19788,16 +19880,14 @@
  * g_locale_from_utf8:
  * @utf8string: a UTF-8 encoded string
  * @len: the length of the string, or -1 if the string is
- *                 nul-terminated (Note that some encodings may allow nul
- *                 bytes to occur inside strings. In that case, using -1
- *                 for the @len parameter is unsafe)
+ *                 nul-terminated.
  * @bytes_read: (out) (optional): location to store the number of bytes in the
  *                 input string that were successfully converted, or %NULL.
  *                 Even if the conversion was successful, this may be
  *                 less than @len if there were partial characters
  *                 at the end of the input. If the error
- *                 #G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value
- *                 stored will the byte offset after the last valid
+ *                 %G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value
+ *                 stored will be the byte offset after the last valid
  *                 input sequence.
  * @bytes_written: (out) (optional): the number of bytes stored in the output
  *                 buffer (not including the terminating nul).
@@ -19809,14 +19899,21 @@
  * system) in the [current locale][setlocale]. On Windows this means
  * the system codepage.
  *
- * Returns: A newly-allocated buffer containing the converted string,
- *               or %NULL on an error, and error will be set.
+ * The input string shall not contain nul characters even if the @len
+ * argument is positive. A nul character found inside the string will result
+ * in error %G_CONVERT_ERROR_ILLEGAL_SEQUENCE. Use g_convert() to convert
+ * input that may contain embedded nul characters.
+ *
+ * Returns: (array length=bytes_written) (element-type guint8) (transfer full):
+ *          A newly-allocated buffer containing the converted string,
+ *          or %NULL on an error, and error will be set.
  */
 
 
 /**
  * g_locale_to_utf8:
- * @opsysstring: a string in the encoding of the current locale. On Windows
+ * @opsysstring: (array length=len) (element-type guint8): a string in the
+ *                 encoding of the current locale. On Windows
  *                 this means the system codepage.
  * @len: the length of the string, or -1 if the string is
  *                 nul-terminated (Note that some encodings may allow nul
@@ -19827,8 +19924,8 @@
  *                 Even if the conversion was successful, this may be
  *                 less than @len if there were partial characters
  *                 at the end of the input. If the error
- *                 #G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value
- *                 stored will the byte offset after the last valid
+ *                 %G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value
+ *                 stored will be the byte offset after the last valid
  *                 input sequence.
  * @bytes_written: (out) (optional): the number of bytes stored in the output
  *                 buffer (not including the terminating nul).
@@ -19839,8 +19936,15 @@
  * the C runtime (usually the same as that used by the operating
  * system) in the [current locale][setlocale] into a UTF-8 string.
  *
- * Returns: A newly-allocated buffer containing the converted string,
- *               or %NULL on an error, and error will be set.
+ * If the source encoding is not UTF-8 and the conversion output contains a
+ * nul character, the error %G_CONVERT_ERROR_EMBEDDED_NUL is set and the
+ * function returns %NULL.
+ * If the source encoding is UTF-8, an embedded nul character is treated with
+ * the %G_CONVERT_ERROR_ILLEGAL_SEQUENCE error for backward compatibility with
+ * earlier versions of this library. Use g_convert() to produce output that
+ * may contain embedded nul characters.
+ *
+ * Returns: (type utf8): The converted string, or %NULL on an error.
  */
 
 
@@ -26324,6 +26428,10 @@
  * if the first item comes before the second, and a positive value
  * if the second  item comes before the first.
  *
+ * Note that when adding a large amount of data to a #GSequence,
+ * it is more efficient to do unsorted insertions and then call
+ * g_sequence_sort() or g_sequence_sort_iter().
+ *
  * Returns: (transfer none): a #GSequenceIter pointing to the new item.
  * Since: 2.14
  */
@@ -26350,6 +26458,10 @@
  * first iterator comes before the second, and a positive value
  * if the second iterator comes before the first.
  *
+ * Note that when adding a large amount of data to a #GSequence,
+ * it is more efficient to do unsorted insertions and then call
+ * g_sequence_sort() or g_sequence_sort_iter().
+ *
  * Returns: (transfer none): a #GSequenceIter pointing to the new item
  * Since: 2.14
  */
@@ -26490,10 +26602,7 @@
  * the second item comes before the first.
  *
  * This function will fail if the data contained in the sequence is
- * unsorted.  Use g_sequence_insert_sorted() or
- * g_sequence_insert_sorted_iter() to add data to your sequence or, if
- * you want to add a large amount of data, call g_sequence_sort() after
- * doing unsorted insertions.
+ * unsorted.
  *
  * Returns: (transfer none) (nullable): an #GSequenceIter pointing to the position of the
  *     first item found equal to @data according to @cmp_func and
@@ -26518,10 +26627,7 @@
  * value if the second iterator comes before the first.
  *
  * This function will fail if the data contained in the sequence is
- * unsorted.  Use g_sequence_insert_sorted() or
- * g_sequence_insert_sorted_iter() to add data to your sequence or, if
- * you want to add a large amount of data, call g_sequence_sort() after
- * doing unsorted insertions.
+ * unsorted.
  *
  * Returns: (transfer none) (nullable): an #GSequenceIter pointing to the position of
  *     the first item found equal to @data according to @cmp_func
@@ -26654,10 +26760,7 @@
  * consider using g_sequence_lookup().
  *
  * This function will fail if the data contained in the sequence is
- * unsorted.  Use g_sequence_insert_sorted() or
- * g_sequence_insert_sorted_iter() to add data to your sequence or, if
- * you want to add a large amount of data, call g_sequence_sort() after
- * doing unsorted insertions.
+ * unsorted.
  *
  * Returns: (transfer none): an #GSequenceIter pointing to the position where @data
  *     would have been inserted according to @cmp_func and @cmp_data
@@ -26684,10 +26787,7 @@
  * consider using g_sequence_lookup_iter().
  *
  * This function will fail if the data contained in the sequence is
- * unsorted.  Use g_sequence_insert_sorted() or
- * g_sequence_insert_sorted_iter() to add data to your sequence or, if
- * you want to add a large amount of data, call g_sequence_sort() after
- * doing unsorted insertions.
+ * unsorted.
  *
  * Returns: (transfer none): a #GSequenceIter pointing to the position in @seq
  *     where @data would have been inserted according to @iter_cmp
@@ -28506,7 +28606,7 @@
  * standard error. If you use this flag, @standard_error must be %NULL.
  * %G_SPAWN_CHILD_INHERITS_STDIN means that the child will inherit the parent's
  * standard input (by default, the child's standard input is attached to
- * /dev/null). If you use this flag, @standard_input must be %NULL.
+ * `/dev/null`). If you use this flag, @standard_input must be %NULL.
  * %G_SPAWN_FILE_AND_ARGV_ZERO means that the first element of @argv is
  * the file to execute, while the remaining elements are the actual
  * argument vector to pass to the file. Normally g_spawn_async_with_pipes()
@@ -28543,8 +28643,8 @@
  * when they are no longer in use. If these parameters are %NULL, the
  * corresponding pipe won't be created.
  *
- * If @standard_input is NULL, the child's standard input is attached to
- * /dev/null unless %G_SPAWN_CHILD_INHERITS_STDIN is set.
+ * If @standard_input is %NULL, the child's standard input is attached to
+ * `/dev/null` unless %G_SPAWN_CHILD_INHERITS_STDIN is set.
  *
  * If @standard_error is NULL, the child's standard error goes to the same
  * location as the parent's standard error unless %G_SPAWN_STDERR_TO_DEV_NULL
@@ -34069,6 +34169,9 @@
  * must be valid UTF-8 encoded text. (Use g_utf8_validate() on all
  * text before trying to use UTF-8 utility functions with it.)
  *
+ * Note you must ensure @dest is at least 4 * @n to fit the
+ * largest possible UTF-8 characters
+ *
  * Returns: @dest
  */
 
@@ -36039,7 +36142,7 @@
  * GVariant *new_variant;
  *
  * new_variant = g_variant_new ("(t^as)",
- *                              /<!-- -->* This cast is required. *<!-- -->/
+ *                              // This cast is required.
  *                              (guint64) some_flags,
  *                              some_strings);
  * ]|
@@ -38090,7 +38193,9 @@
  * goffset:
  *
  * A signed integer type that is used for file offsets,
- * corresponding to the C99 type off64_t.
+ * corresponding to the POSIX type `off_t` as if compiling with
+ * `_FILE_OFFSET_BITS` set to 64. #goffset is always 64 bits wide, even on
+ * 32-bit architectures.
  * Values of this type can range from #G_MINOFFSET to
  * #G_MAXOFFSET.
  *

diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c
index f52cc7c..4e964e0 100644 (file)
--- a/gir/gobject-2.0.c
+++ b/gir/gobject-2.0.c
@@ -2948,6 +2948,8 @@
  * #GTypeInfo.) It must not be called after after @class_init has
  * been called for any object types implementing this interface.
  *
+ * If @pspec is a floating reference, it will be consumed.
+ *
  * Since: 2.4
  */
 
@@ -3202,7 +3204,7 @@
  * If the previous value was replaced then ownership of the
  * old value (@oldval) is passed to the caller, including
  * the registered destroy notify for it (passed out in @old_destroy).
- * Its up to the caller to free this as he wishes, which may
+ * It’s up to the caller to free this as needed, which may
  * or may not include using @old_destroy as sometimes replacement
  * should not destroy the object in the normal way.
  *
@@ -3231,7 +3233,7 @@
  * If the previous value was replaced then ownership of the
  * old value (@oldval) is passed to the caller, including
  * the registered destroy notify for it (passed out in @old_destroy).
- * Its up to the caller to free this as he wishes, which may
+ * It’s up to the caller to free this as needed, which may
  * or may not include using @old_destroy as sometimes replacement
  * should not destroy the object in the normal way.
  *

diff --git a/girepository/ginvoke.c b/girepository/ginvoke.c
index bd5aa2c..f7e6449 100644 (file)
--- a/girepository/ginvoke.c
+++ b/girepository/ginvoke.c
@@ -233,7 +233,7 @@ g_value_from_ffi_value (GValue           *gvalue,
 }
 
 /**
- * gi_cclosure_marshal_generic:
+ * gi_cclosure_marshal_generic: (skip)
  * @closure: TODO
  * @return_gvalue: TODO
  * @n_param_values: TODO

diff --git a/girepository/girepository.c b/girepository/girepository.c
index df0f247..10282c7 100644 (file)
--- a/girepository/girepository.c
+++ b/girepository/girepository.c
@@ -41,6 +41,17 @@
  *
  * #GIRepository is used to manage repositories of namespaces. Namespaces
  * are represented on disk by type libraries (.typelib files).
+ *
+ * ### Discovery of type libraries
+ *
+ * #GIRepository will typically look for a `girepository-1.0` directory
+ * under the library directory used when compiling gobject-introspection.
+ *
+ * It is possible to control the search paths programmatically, using
+ * g_irepository_prepend_search_path(). It is also possible to modify
+ * the search paths by using the `GI_TYPELIB_PATH` environment variable.
+ * The environment variable takes precedence over the default search path
+ * and the g_irepository_prepend_search_path() calls.
  */
 
 
@@ -198,7 +209,8 @@ init_globals (void)
  *   search path
  *
  * Prepends @directory to the typelib search path.
- * See g_irepository_get_search_path().
+ *
+ * See also: g_irepository_get_search_path().
  */
 void
 g_irepository_prepend_search_path (const char *directory)
@@ -1369,7 +1381,7 @@ find_namespace_latest (const gchar  *namespace,
  */
 GList *
 g_irepository_enumerate_versions (GIRepository *repository,
-                        const gchar  *namespace_)
+                                  const gchar  *namespace_)
 {
   GList *ret = NULL;
   GSList *candidates, *link;

diff --git a/girepository/giunioninfo.c b/girepository/giunioninfo.c
index a819595..9a7f861 100644 (file)
--- a/girepository/giunioninfo.c
+++ b/girepository/giunioninfo.c
@@ -154,7 +154,7 @@ g_union_info_is_discriminated (GIUnionInfo *info)
  *
  * Returns offset of the discriminator field in the structure.
  *
- * Returns: (transfer full): offset in bytes of the discriminator
+ * Returns: offset in bytes of the discriminator
  */
 gint
 g_union_info_get_discriminator_offset (GIUnionInfo *info)

diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
index 29de0ee..a8bd5b1 100644 (file)
--- a/giscanner/ccompiler.py
+++ b/giscanner/ccompiler.py
@@ -116,7 +116,7 @@ class CCompiler(object):
         runtime_path_envvar = []
         runtime_paths = []
 
-        if self.check_is_msvc():
+        if os.name == 'nt':
             runtime_path_envvar = ['LIB', 'PATH']
         else:
             runtime_path_envvar = ['LD_LIBRARY_PATH']
@@ -288,9 +288,10 @@ class CCompiler(object):
             proc = subprocess.Popen([self.compiler_cmd, '-print-search-dirs'],
                                     stdout=subprocess.PIPE)
             o, e = proc.communicate()
+            libsearch = options.library_paths
             for line in o.decode('ascii').splitlines():
                 if line.startswith('libraries: '):
-                    libsearch = line[len('libraries: '):].split(os.pathsep)
+                    libsearch += line[len('libraries: '):].split(os.pathsep)
 
         shlibs = []
         not_resolved = []

diff --git a/giscanner/dumper.py b/giscanner/dumper.py
index 7f77bd2..3c7220b 100644 (file)
--- a/giscanner/dumper.py
+++ b/giscanner/dumper.py
@@ -227,7 +227,7 @@ class DumpCompiler(object):
         else:
             args.extend(['-o', output])
             if libtool:
-                if os.name == 'nt':
+                if utils.host_os() == 'nt':
                     args.append('-Wl,--export-all-symbols')
                 else:
                     args.append('-export-dynamic')

diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py
index 23ed410..275f1c0 100644 (file)
--- a/giscanner/maintransformer.py
+++ b/giscanner/maintransformer.py
@@ -330,6 +330,7 @@ class MainTransformer(object):
         # might lose the ctype from the original node.
         if type_node is not None:
             result.ctype = type_node.ctype
+            result.complete_ctype = type_node.complete_ctype
         return result
 
     def _get_position(self, func, param):

diff --git a/scannerlexer.c b/giscanner/scannerlexer.c
similarity index 64%
rename from scannerlexer.c
rename to giscanner/scannerlexer.c
index bb1673d..07e1868 100644 (file)
--- a/scannerlexer.c
+++ b/giscanner/scannerlexer.c
@@ -1,5 +1,5 @@
 
-#line 3 "scannerlexer.c"
+#line 3 "giscanner/scannerlexer.c"
 
 #define  YY_INT_ALIGNED short int
 
@@ -360,8 +360,8 @@ static void yynoreturn yy_fatal_error (yyconst char* msg  );
        *yy_cp = '\0'; \
        (yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 161
-#define YY_END_OF_BUFFER 162
+#define YY_NUM_RULES 163
+#define YY_END_OF_BUFFER 164
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -369,126 +369,132 @@ struct yy_trans_info
        flex_int32_t yy_verify;
        flex_int32_t yy_nxt;
        };
-static yyconst flex_int16_t yy_acclist[1047] =
+static yyconst flex_int16_t yy_acclist[1095] =
     {   0,
-      162,  160,  161,    3,  160,  161,    1,  161,   45,  160,
-      161,  160,  161,   20,  160,  161,   40,  160,  161,   42,
-      160,  161,  160,  161,   29,  160,  161,   30,  160,  161,
-       38,  160,  161,   36,  160,  161,   69,  160,  161,   37,
-      160,  161,   35,  160,  161,   39,  160,  161,  153,  160,
-      161,  153,  160,  161,   32,  160,  161,   31,  160,  161,
-       47,  160,  161,   46,  160,  161,   48,  160,  161,   34,
-      160,  161,  109,  150,  160,  161,  109,  150,  160,  161,
-      109,  150,  160,  161,  109,  150,  160,  161,  109,  150,
-      160,  161,   25,  160,  161,  160,  161,   27,  160,  161,
-
-       41,  160,  161,  109,  150,  160,  161,  109,  150,  160,
-      161,  109,  150,  160,  161,  109,  150,  160,  161,  109,
-      150,  160,  161,  109,  150,  160,  161,  109,  150,  160,
-      161,  109,  150,  160,  161,  109,  150,  160,  161,  109,
-      150,  160,  161,  109,  150,  160,  161,  109,  150,  160,
-      161,  109,  150,  160,  161,  109,  150,  160,  161,  109,
-      150,  160,  161,  109,  150,  160,  161,   21,  160,  161,
-       43,  160,  161,   23,  160,  161,   44,  160,  161,    3,
-        1,   62,  158,   53,   24,   65,   55,  156,   51,   67,
-       49,   68,   50,   70,  154,    4,    6,   52,  154,  152,
-
-      153,  153,  153,  153,   28,   22,   26,   57,   63,   61,
-       64,   58,  109,  150,  109,  150,  109,  150,  109,  150,
-        2,   54,  109,  150,  109,  150,  109,  150,  109,  150,
-      109,  150,  109,  150,  109,  150,  109,  150,  109,  150,
-      109,  150,  109,  150,  109,  150,  109,  119,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  127,  150,  109,  150,  109,  150,
-      109,  150,  109,  150,  109,  150,  109,  150,  109,  150,
-      109,  150,  109,  150,  109,  150,  109,  150,  109,  150,
-       56,   66,   33,  154,    6,  152,  153,  152,  153,  155,
-
-      153,  153,  153,  151,   59,   60,  109,  150,  109,  150,
-      159,  157,  109,  150,  109,  150,  109,  150,  109,  150,
-      109,  150,  109,  150,  109,  150,  109,  150,  109,  150,
-      109,  150,  109,  150,  109,  150,  109,  150,  109,  150,
-      109,  150,  109,  150,  109,  150,  109,  110,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  125,  150,  109,  150,
-      109,  150,  109,  129,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  154,
-      152,  153,  152,  153,  152,  153,  155,  153,  151,  151,
-      109,  150,  109,  150,  109,  150,  105,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      111,  150,  109,  112,  150,  109,  150,  109,  114,  150,
-      109,  115,  150,  109,  150,  109,  150,  109,  150,  109,
-
-      150,  109,  121,  150,  109,  122,  150,  109,  150,  109,
-      150,  109,  150,  109,  126,  150,  109,  150,  109,  134,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  107,
-      109,  150,  109,  150,  109,  150,  109,  150,  109,  147,
-      150,  109,  150,  109,  150,   18,   13,  152,  153,  151,
-      151,  151,  106,  109,  150,  109,  150,  109,  150,   94,
-      109,  150,  109,  150,  109,  150,  109,  150,  109,  150,
-       74,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  100,  109,  150,  109,  113,  150,  109,  116,  150,
-      109,  150,  109,  150,  109,  150,  109,  150,  108,  109,
-      150,  109,  124,  150,  109,  150,  109,  150,  109,  150,
-      109,  150,  109,  138,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  145,  150,
-      109,  150,  109,  150,  109,  149,  150,   15,  151,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      120,  150,  109,  123,  150,  109,  128,  150,  109,  150,
-      109,  150,  109,  137,  150,  109,  139,  150,  109,  140,
-      150,  109,  141,  150,  109,  142,  150,  109,  143,  150,
-      109,  150,  109,  150,  109,  150,   14,   16,    5,  109,
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,   75,  109,  150,  109,  150,   96,  109,
-      150,   78,  109,  150,  109,  150,  109,  150,  109,  150,
-      109,  150,  101,  109,  150,  109,  150,  109,  150,  109,
-
-      150,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  118,  150,  109,  150,  109,  150,  109,  144,
-      150,  109,  150,  109,  150,   12,  109,  150,  109,  150,
-      109,  150,   83,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,   81,  109,  150,
-      109,  133,  150,  109,  150,  109,  150,   87,  109,  150,
-      109,  150,   91,  109,  150,  109,  150,  109,  150,  109,
-      117,  150,  109,  135,  150,  109,  136,  150,  109,  146,
-      150,  109,  148,  150,    8,   11,   19,   17,  109,  150,
-      109,  150,  102,  109,  150,   86,  109,  150,  109,  150,
-
-       84,  109,  150,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,   82,  109,  150,  109,  150,  109,  150,
-       99,  109,  150,  109,  132,  150,  109,  150,    7,    8,
-      109,  150,  109,  150,  109,  150,  109,  150,  109,  150,
-      109,  150,   80,  109,  150,  109,  131,  150,   89,  109,
-      150,   88,  109,  150,  109,  150,   92,  109,  150,  109,
-      150,  109,  150,  109,  150,   77,  109,  150,  109,  150,
-      109,  150,  109,  130,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,  109,  150,   90,  109,  150,
-       93,  109,  150,  109,  150,  109,  150,  109,  150,   76,
-
-      109,  150,   98,   79,  109,  150,  109,  150,  109,  150,
-      109,  150,   71,  109,  150,  109,  150,  109,  150,  109,
-      150,  109,  150,  109,  150,   72,  103,  109,  150,  109,
-      150,   85,  109,  150,  104,  109,  150,   73,    9,    9,
-       12,   10,   10,   11,   97,   95
+      164,  162,  163,    3,  162,  163,    1,  163,   45,  162,
+      163,  162,  163,   20,  162,  163,   40,  162,  163,   42,
+      162,  163,  162,  163,   29,  162,  163,   30,  162,  163,
+       38,  162,  163,   36,  162,  163,   69,  162,  163,   37,
+      162,  163,   35,  162,  163,   39,  162,  163,  155,  162,
+      163,  155,  162,  163,   32,  162,  163,   31,  162,  163,
+       47,  162,  163,   46,  162,  163,   48,  162,  163,   34,
+      162,  163,  111,  152,  162,  163,  111,  152,  162,  163,
+      111,  152,  162,  163,  111,  152,  162,  163,  111,  152,
+      162,  163,   25,  162,  163,  162,  163,   27,  162,  163,
+
+       41,  162,  163,  111,  152,  162,  163,  111,  152,  162,
+      163,  111,  152,  162,  163,  111,  152,  162,  163,  111,
+      152,  162,  163,  111,  152,  162,  163,  111,  152,  162,
+      163,  111,  152,  162,  163,  111,  152,  162,  163,  111,
+      152,  162,  163,  111,  152,  162,  163,  111,  152,  162,
+      163,  111,  152,  162,  163,  111,  152,  162,  163,  111,
+      152,  162,  163,  111,  152,  162,  163,   21,  162,  163,
+       43,  162,  163,   23,  162,  163,   44,  162,  163,    3,
+        1,   62,  160,   53,   24,   65,   55,  158,   51,   67,
+       49,   68,   50,   70,  156,    4,    6,   52,  156,  154,
+
+      155,  155,  155,  155,   28,   22,   26,   57,   63,   61,
+       64,   58,  111,  152,  111,  152,  111,  152,  111,  152,
+        2,   54,  111,  152,  111,  152,  111,  152,  111,  152,
+      111,  152,  111,  152,  111,  152,  111,  152,  111,  152,
+      111,  152,  111,  152,  111,  152,  111,  152,  111,  121,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  129,  152,  111,  152,
+      111,  152,  111,  152,  111,  152,  111,  152,  111,  152,
+      111,  152,  111,  152,  111,  152,  111,  152,  111,  152,
+      111,  152,  111,  152,   56,   66,   33,  156,    6,  154,
+
+      155,  154,  155,  157,  155,  155,  155,  153,   59,   60,
+      111,  152,  111,  152,  161,  159,  111,  152,  111,  152,
+      111,  152,  111,  152,  111,  152,  111,  152,  111,  152,
+      111,  152,  111,  152,  111,  152,  111,  152,  111,  152,
+      111,  152,  111,  152,  111,  152,  111,  152,  111,  152,
+      111,  152,  111,  112,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  127,  152,  111,  152,  111,  152,  111,  131,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  156,  154,  155,
+      154,  155,  154,  155,  157,  155,  153,  153,  111,  152,
+      111,  152,  111,  152,  107,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      113,  152,  111,  114,  152,  111,  152,  111,  116,  152,
+
+      111,  117,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  123,  152,  111,  124,  152,  111,  152,  111,
+      152,  111,  152,  111,  128,  152,  111,  152,  111,  136,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  109,  111,  152,  111,  152,  111,  152,  111,  152,
+      111,  149,  152,  111,  152,  111,  152,   18,   13,  154,
+      155,  153,  153,  153,  108,  111,  152,  111,  152,  111,
+      152,   96,  111,  152,  111,  152,  111,  152,  111,  152,
+      111,  152,  111,  152,   74,  111,  152,  111,  152,  111,
+
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  102,  111,  152,  111,  115,
+      152,  111,  118,  152,  111,  152,  111,  152,  111,  152,
+      111,  152,  110,  111,  152,  111,  126,  152,  111,  152,
+      111,  152,  111,  152,  111,  152,  111,  140,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  147,  152,  111,  152,  111,  152,
+      111,  151,  152,   15,  153,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  122,  152,
+      111,  125,  152,  111,  130,  152,  111,  152,  111,  152,
+      111,  139,  152,  111,  141,  152,  111,  142,  152,  111,
+      143,  152,  111,  144,  152,  111,  145,  152,  111,  152,
+      111,  152,  111,  152,  111,  152,   14,   16,    5,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,   75,  111,  152,  111,  152,
+
+       98,  111,  152,   78,  111,  152,  111,  152,  111,  152,
+      111,  152,  111,  152,  103,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  120,  152,  111,  152,  111,  152,
+      111,  152,  111,  146,  152,  111,  152,  111,  152,   12,
+      111,  152,  111,  152,  111,  152,   83,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,   81,  111,  152,  111,  135,  152,  111,
+      152,  111,  152,   87,  111,  152,  111,  152,   93,  111,
+      152,  111,  152,  111,  152,  111,  119,  152,  111,  137,
+
+      152,  111,  138,  152,  111,  152,  111,  148,  152,  111,
+      150,  152,    8,   11,   19,   17,  111,  152,  111,  152,
+      104,  111,  152,   86,  111,  152,  111,  152,   84,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,   82,  111,  152,  111,  152,  111,  152,
+      101,  111,  152,  111,  134,  152,  111,  152,  111,  152,
+        7,    8,  111,  152,  111,  152,  111,  152,  111,  152,
+      111,  152,  111,  152,  111,  152,   80,  111,  152,  111,
+      133,  152,   89,  111,  152,   88,  111,  152,  111,  152,
+       94,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+
+      152,  111,  152,   77,  111,  152,  111,  152,  111,  152,
+      111,  132,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,  111,  152,  111,  152,  111,  152,   90,
+      111,  152,   95,  111,  152,   91,  111,  152,  111,  152,
+      111,  152,  111,  152,   92,  111,  152,   76,  111,  152,
+      100,   79,  111,  152,  111,  152,  111,  152,  111,  152,
+       71,  111,  152,  111,  152,  111,  152,  111,  152,  111,
+      152,  111,  152,   72,  105,  111,  152,  111,  152,   85,
+      111,  152,  106,  111,  152,   73,    9,    9,   12,   10,
+       10,   11,   99,   97
+
     } ;
 
-static yyconst flex_int16_t yy_accept[710] =
+static yyconst flex_int16_t yy_accept[733] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   12,   14,   17,
        20,   23,   25,   28,   31,   34,   37,   40,   43,   46,
@@ -503,71 +509,74 @@ static yyconst flex_int16_t yy_accept[710] =
 
       211,  212,  213,  215,  217,  219,  219,  219,  221,  222,
       223,  225,  227,  229,  231,  233,  235,  237,  239,  241,
-      243,  245,  247,  250,  252,  254,  256,  258,  260,  262,
-      264,  267,  269,  271,  273,  275,  277,  279,  281,  283,
-      285,  287,  289,  291,  292,  293,  293,  293,  293,  293,
-      293,  293,  293,  294,  294,  295,  295,  295,  296,  298,
-      300,  300,  301,  302,  303,  304,  305,  306,  307,  309,
-      311,  311,  312,  312,  312,  313,  313,  315,  317,  319,
+      243,  245,  247,  249,  252,  254,  256,  258,  260,  262,
+      264,  266,  269,  271,  273,  275,  277,  279,  281,  283,
+      285,  287,  289,  291,  293,  295,  296,  297,  297,  297,
+      297,  297,  297,  297,  297,  298,  298,  299,  299,  299,
+      300,  302,  304,  304,  305,  306,  307,  308,  309,  310,
+      311,  313,  315,  315,  316,  316,  316,  317,  317,  319,
       321,  323,  325,  327,  329,  331,  333,  335,  337,  339,
-      341,  343,  345,  347,  350,  352,  354,  356,  358,  360,
-
-      362,  364,  366,  368,  370,  372,  374,  376,  379,  381,
-      383,  386,  388,  390,  392,  394,  396,  398,  400,  402,
-      404,  406,  408,  410,  412,  414,  416,  418,  420,  420,
-      420,  420,  420,  420,  420,  420,  420,  420,  420,  420,
-      421,  421,  423,  425,  427,  428,  429,  430,  431,  433,
-      435,  437,  440,  442,  444,  446,  448,  450,  452,  454,
+      341,  343,  345,  347,  349,  351,  353,  356,  358,  360,
+
+      362,  364,  366,  368,  370,  372,  374,  376,  378,  380,
+      382,  385,  387,  389,  392,  394,  396,  398,  400,  402,
+      404,  406,  408,  410,  412,  414,  416,  418,  420,  422,
+      424,  426,  428,  428,  428,  428,  428,  428,  428,  428,
+      428,  428,  428,  428,  429,  429,  431,  433,  435,  436,
+      437,  438,  439,  441,  443,  445,  448,  450,  452,  454,
       456,  458,  460,  462,  464,  466,  468,  470,  472,  474,
-      476,  478,  480,  483,  486,  488,  491,  494,  496,  498,
-      500,  502,  505,  508,  510,  512,  514,  517,  519,  522,
-      524,  526,  528,  530,  532,  534,  536,  538,  540,  543,
-
-      545,  547,  549,  552,  554,  556,  556,  557,  557,  557,
-      557,  557,  557,  558,  558,  558,  558,  558,  558,  560,
-      561,  562,  563,  566,  568,  570,  573,  575,  577,  579,
-      581,  584,  586,  588,  590,  592,  594,  596,  598,  600,
-      602,  604,  606,  608,  610,  612,  615,  618,  621,  623,
-      625,  627,  629,  632,  635,  637,  639,  641,  643,  646,
-      648,  650,  652,  654,  656,  658,  661,  663,  665,  668,
-      668,  668,  668,  669,  669,  669,  669,  669,  669,  669,
-      669,  670,  672,  674,  676,  678,  680,  682,  684,  684,
-      686,  688,  690,  692,  694,  696,  698,  700,  702,  704,
-
-      706,  708,  710,  712,  714,  716,  718,  720,  723,  726,
-      729,  731,  733,  736,  739,  742,  745,  748,  751,  753,
-      755,  757,  757,  757,  758,  758,  759,  759,  759,  759,
-      759,  759,  760,  762,  764,  766,  768,  770,  772,  774,
-      774,  777,  779,  782,  785,  787,  789,  791,  793,  796,
-      798,  800,  802,  804,  806,  808,  810,  812,  815,  817,
-      819,  822,  824,  826,  826,  826,  826,  826,  827,  827,
-      827,  827,  827,  827,  829,  831,  833,  836,  838,  840,
-      842,  842,  842,  844,  846,  848,  851,  854,  856,  858,
-      861,  863,  866,  868,  870,  873,  876,  879,  879,  882,
-
-      885,  886,  886,  886,  886,  886,  886,  887,  887,  887,
-      888,  888,  889,  891,  893,  896,  899,  901,  904,  904,
-      904,  904,  906,  908,  910,  912,  914,  917,  919,  921,
-      924,  927,  929,  929,  930,  931,  931,  931,  931,  931,
-      933,  935,  937,  937,  937,  937,  939,  941,  943,  946,
-      949,  952,  955,  957,  960,  960,  960,  960,  960,  960,
-      962,  964,  966,  966,  966,  966,  969,  969,  969,  971,
-      973,  976,  978,  978,  978,  978,  978,  978,  980,  982,
-      984,  984,  984,  984,  986,  986,  986,  986,  988,  991,
-      994,  994,  994,  994,  994,  994,  996,  998, 1000, 1000,
-
-     1000, 1000, 1003, 1004, 1004, 1007, 1007, 1007, 1007, 1007,
-     1007, 1009, 1011, 1013, 1014, 1014, 1014, 1014, 1014, 1014,
-     1014, 1014, 1014, 1016, 1018, 1020, 1020, 1020, 1020, 1020,
-     1020, 1020, 1020, 1020, 1022, 1024, 1026, 1026, 1027, 1027,
-     1027, 1027, 1027, 1027, 1027, 1030, 1032, 1035, 1035, 1035,
-     1035, 1035, 1035, 1035, 1035, 1038, 1038, 1038, 1038, 1038,
-     1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
-     1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
-     1039, 1040, 1040, 1040, 1042, 1042, 1042, 1042, 1042, 1042,
-     1042, 1043, 1043, 1043, 1045, 1045, 1045, 1045, 1046, 1046,
-
-     1046, 1046, 1046, 1046, 1046, 1046, 1046, 1047, 1047
+      476,  478,  480,  482,  484,  486,  488,  490,  493,  496,
+      498,  501,  504,  506,  508,  510,  512,  515,  518,  520,
+      522,  524,  527,  529,  532,  534,  536,  538,  540,  542,
+
+      544,  546,  548,  550,  552,  555,  557,  559,  561,  564,
+      566,  568,  568,  569,  569,  569,  569,  569,  569,  570,
+      570,  570,  570,  570,  570,  572,  573,  574,  575,  578,
+      580,  582,  585,  587,  589,  591,  593,  595,  598,  600,
+      602,  604,  606,  608,  610,  612,  614,  616,  618,  620,
+      622,  624,  626,  629,  632,  635,  637,  639,  641,  643,
+      646,  649,  651,  653,  655,  657,  660,  662,  664,  666,
+      668,  670,  672,  674,  677,  679,  681,  684,  684,  684,
+      684,  685,  685,  685,  685,  685,  685,  685,  685,  686,
+      688,  690,  692,  694,  696,  698,  700,  702,  702,  704,
+
+      706,  708,  710,  712,  714,  716,  718,  720,  722,  724,
+      726,  728,  730,  732,  734,  736,  738,  741,  744,  747,
+      749,  751,  754,  757,  760,  763,  766,  769,  771,  773,
+      775,  777,  777,  777,  778,  778,  779,  779,  779,  779,
+      779,  779,  780,  782,  784,  786,  788,  790,  792,  794,
+      796,  796,  799,  801,  804,  807,  809,  811,  813,  815,
+      818,  820,  822,  824,  826,  828,  830,  832,  834,  837,
+      839,  841,  843,  846,  848,  850,  850,  850,  850,  850,
+      851,  851,  851,  851,  851,  851,  853,  855,  857,  860,
+      862,  864,  866,  868,  868,  868,  870,  872,  874,  877,
+
+      880,  882,  884,  887,  889,  892,  894,  896,  899,  902,
+      905,  907,  907,  910,  913,  914,  914,  914,  914,  914,
+      914,  915,  915,  915,  916,  916,  917,  919,  921,  924,
+      927,  929,  932,  934,  934,  934,  934,  936,  938,  940,
+      942,  944,  947,  949,  951,  954,  957,  959,  961,  961,
+      962,  963,  963,  963,  963,  963,  965,  967,  969,  971,
+      971,  971,  971,  973,  975,  977,  980,  983,  986,  989,
+      991,  994,  996,  996,  996,  996,  996,  996,  998, 1000,
+     1002, 1004, 1004, 1004, 1004, 1007, 1007, 1007, 1009, 1011,
+     1014, 1016, 1018, 1018, 1018, 1018, 1018, 1018, 1020, 1022,
+
+     1024, 1026, 1026, 1026, 1026, 1028, 1028, 1028, 1028, 1030,
+     1033, 1036, 1039, 1039, 1039, 1039, 1039, 1039, 1041, 1043,
+     1045, 1048, 1048, 1048, 1048, 1051, 1052, 1052, 1055, 1055,
+     1055, 1055, 1055, 1055, 1057, 1059, 1061, 1062, 1062, 1062,
+     1062, 1062, 1062, 1062, 1062, 1062, 1064, 1066, 1068, 1068,
+     1068, 1068, 1068, 1068, 1068, 1068, 1068, 1070, 1072, 1074,
+     1074, 1075, 1075, 1075, 1075, 1075, 1075, 1075, 1078, 1080,
+     1083, 1083, 1083, 1083, 1083, 1083, 1083, 1083, 1086, 1086,
+     1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086,
+     1086, 1086, 1086, 1087, 1087, 1087, 1087, 1087, 1087, 1087,
+
+     1087, 1087, 1087, 1087, 1088, 1088, 1088, 1090, 1090, 1090,
+     1090, 1090, 1090, 1090, 1091, 1091, 1091, 1093, 1093, 1093,
+     1093, 1094, 1094, 1094, 1094, 1094, 1094, 1094, 1094, 1094,
+     1095, 1095
     } ;
 
 static yyconst YY_CHAR yy_ec[256] =
@@ -615,177 +624,181 @@ static yyconst YY_CHAR yy_meta[85] =
         1,    1,    1,    1
     } ;
 
-static yyconst flex_uint16_t yy_base[736] =
+static yyconst flex_uint16_t yy_base[759] =
     {   0,
-        0,    0, 1205, 1206,   83,    0, 1173,   79,   84,   59,
-       82,   82, 1206, 1206, 1172,   79, 1206,   80,   78,   95,
-      138,  199, 1170, 1206,   97, 1170,   76, 1206,    0, 1166,
-     1144,  108, 1152, 1206, 1194, 1206, 1165,   85,   43,   51,
-       76,   75,   69,  101, 1125,   61, 1124, 1133,  103,   70,
-     1123, 1121, 1127, 1206,  102, 1206, 1206,  148,    0, 1206,
-      130, 1206, 1186,  169, 1128,  103, 1126, 1122, 1113, 1206,
-     1206, 1206, 1206,  158, 1206, 1181, 1206, 1206, 1206, 1206,
-     1206, 1206, 1165,  255,  173,    0, 1206,    0,  165,    0,
-      229,  163,   74,    0, 1206, 1206, 1206, 1151, 1206, 1206,
-
-     1206, 1150,    0, 1137, 1139,  147,  175, 1129, 1206, 1206,
-     1107, 1109,  104,  227, 1107, 1100, 1103, 1112, 1098, 1114,
-     1100, 1107, 1092, 1093, 1090, 1090, 1096, 1092, 1089, 1086,
-        0,  130, 1090,  195, 1088,  121,  146, 1093, 1081, 1084,
-      136,  164, 1090, 1206, 1206,  285, 1092,  172, 1093,  202,
-     1082, 1094, 1206,  303, 1206, 1119,    0,    0,  198,  168,
-      311,  319,  185, 1206,  196,  246, 1206, 1206, 1101,  305,
-      265, 1206, 1144,  218, 1206, 1143, 1107, 1074, 1073,  195,
-     1075,  275,  291, 1081, 1062, 1070, 1068, 1077,  289, 1057,
-     1071, 1064, 1108,    0, 1062, 1064, 1074, 1069, 1056,  278,
-
-     1071, 1069, 1065, 1056, 1063, 1049, 1065,    0, 1050, 1055,
-        0, 1056, 1053, 1042, 1040, 1042, 1044, 1052, 1037, 1035,
-     1035, 1048, 1047, 1036, 1041, 1045, 1047, 1035, 1098, 1036,
-     1038, 1038, 1033, 1093, 1035, 1035, 1033, 1030,  344,  352,
-     1059,  209, 1206,  314, 1206, 1206,  339,  316, 1052, 1045,
-     1046,    0, 1020, 1030, 1016, 1024, 1016, 1014, 1007, 1020,
-     1010, 1020, 1003,  318, 1007, 1002, 1012, 1014, 1001, 1002,
-     1003, 1045,    0,    0, 1002,    0,    0,  993, 1002,  990,
-      997,    0,    0,  991, 1002,  987,    0,  991,    0,  986,
-      986,  985,  982,  995,  984,  989,  994,  993,    0,  991,
-
-      980,  986,    0,  973,  986, 1042, 1206,  975, 1038, 1039,
-      980, 1037, 1206,  978,  978, 1032,  968,  382, 1206,  213,
-     1206,  350,    0,  987,  990,    0,  959,  957,  957,  300,
-      395,  958,  971,  955,  960,  966,  961,  369,  955,  949,
-      953,  963,  960,  945,  962,    0,    0,    0,  948,  949,
-      955,  945,    0,    0,  953,  938,  947,  941,    0,  950,
-      947,  949,  932,  942,  944,    0,  934,  938,    0,  941,
-      997,  996, 1206,  995,  396,  936,  400,  940,  981,  975,
-     1206,  968,  944,  970,  923,  914,  913,  930,  400,  931,
-      921,  917,  909,  909,  912,  911,  957,  954,  902,  904,
-
-      915,  918,  903,  951,  897,  895,  895,    0,    0,    0,
-      908,  909,    0,    0,    0,    0,    0,    0,  905,  905,
-      897,  958,  959, 1206,  958, 1206,  405,  406,  410,  411,
-      955, 1206,  935,  933,  935,  889,  883,  885,  886,  882,
-      437,  894,    0,    0,  879,  876,  888,  921,    0,  879,
-      881,  885,  876,  881,  919,  876,  879,    0,  866,  863,
-      931,  876,  874,    0,  878,  929,  441, 1206,  400,  443,
-      449,  928,  927,  874,  904,  901,    0,  857,  852,  864,
-      856,  454,  847,  861,  856,  864,  863,  850,  858,  860,
-      847,    0,  887,  845,    0,    0,    0,  853,    0,    0,
-
-      898,  869,  425,  853,  904,  461, 1206,  415,  903, 1206,
-      902, 1206,  868,  848,    0,    0,  831,    0,  845,  845,
-      829,  824,  839,  826,  840,  820,    0,  819,  837,    0,
-      836,  830,  826, 1206,  876,  845,  426,  846,  427,  840,
-      848,  823,  808,  805,  813,  819,  467,  809,    0,    0,
-      822,    0,  802,  820,  818,  818,  437,  830,  444,  827,
-      825,  811,  804,  797,  810,  810,  469,  805,  808,  807,
-        0,  806,  788,  812,  446,  803,  450,  810,  812,  791,
-      787,  786,  778,  796,    0,  837,  460,  794,    0,    0,
-      843,  811,  454,  799,  459,  797,  797,  782,  782,  785,
-
-      776,    0, 1206,  462,    0,  784,  804,  474,  801,  475,
-      802,  787,  770, 1206,  759,  765,  220,  776,  786,  316,
-      795,  479,  784,  793,  766,  761,  764,  467,  750,  778,
-      480,  777,  481,  772,  775,  759,  750, 1206,  474,  742,
-      777,  485,  770,  482,    0,  765,    0,  752,  478,  755,
-      764,  491,  771,  497,    0,  753,  476,  716,  690,  492,
-      698,  494,  688,  486,  678,  686,  498,  685,  499, 1206,
-      490,  675,  512,  516,  576,  504,  516,  575,  604,  594,
-     1206,  559,  555, 1206,  536,  540,  544,  500,  552,  549,
-     1206,  548,  545, 1206,  531,  523,  458,  509,  439,  450,
-
-      317,  240,  242,  111,  170,   92, 1206, 1206,  559,  569,
-      579,  584,  594,  599,  608,  618,  627,  637,  647,  657,
-      667,  677,  687,  691,  701,  711,  721,  728,  737,  747,
-      757,  767,  777,  787,  797
+        0,    0, 1228, 1229,   83,    0, 1196,   79,   84,   59,
+       82,   82, 1229, 1229, 1195,   79, 1229,   80,   78,   95,
+      138,  199, 1193, 1229,   97, 1193,   76, 1229,    0, 1189,
+     1167,  108, 1175, 1229, 1217, 1229, 1188,   85,   43,   51,
+       76,   75,   69,  101, 1148,   61, 1147, 1156,  103,  106,
+     1146, 1144, 1150, 1229,  110, 1229, 1229,  148,    0, 1229,
+      130, 1229, 1209,  207, 1151,  103, 1149, 1145, 1136, 1229,
+     1229, 1229, 1229,  131, 1229, 1204, 1229, 1229, 1229, 1229,
+     1229, 1229, 1188,  255,  184,    0, 1229,    0,  195,    0,
+      280,  197,  106,    0, 1229, 1229, 1229, 1174, 1229, 1229,
+
+     1229, 1173,    0, 1160, 1162,  147,  163, 1152, 1229, 1229,
+     1130, 1132,  109, 1135,  254, 1129, 1122, 1125, 1134, 1120,
+     1136, 1122, 1129, 1114, 1115, 1112, 1112, 1118, 1114, 1111,
+     1108,    0,  123, 1112,  129, 1110,  113,  138, 1115, 1106,
+     1102, 1105,  131,  142, 1111, 1229, 1229,  230, 1113,  185,
+     1114,  202, 1103, 1115, 1229,  317, 1229, 1140,    0,    0,
+      242,  169,  325,  333,  190, 1229,  200,  318, 1229, 1229,
+     1122,  159,  189, 1229, 1165,  236, 1229, 1164, 1128, 1095,
+     1094,  191, 1096, 1090,  195,  141, 1101, 1082, 1090, 1088,
+     1097,  222, 1077, 1091, 1084, 1128,    0, 1082, 1084, 1094,
+
+     1089, 1076,  210, 1091, 1089, 1085, 1076, 1083, 1069, 1085,
+        0, 1070, 1075,    0, 1076, 1073, 1062, 1060, 1062, 1064,
+     1072, 1057, 1055, 1055, 1068, 1067, 1066, 1055, 1060, 1064,
+     1066, 1054, 1117, 1055, 1057, 1057, 1052, 1112, 1054, 1054,
+     1052, 1049,  357,  381, 1078,  250, 1229,  244, 1229, 1229,
+      320,  319, 1071, 1064, 1065,    0, 1039, 1049, 1035, 1043,
+     1035, 1041, 1032, 1025, 1038, 1028, 1038, 1021,  297, 1025,
+     1020, 1030, 1032, 1019, 1020, 1021, 1063,    0,    0, 1020,
+        0,    0, 1011, 1020, 1008, 1015,    0,    0, 1009, 1020,
+     1005,    0, 1009,    0, 1004, 1004, 1003, 1000, 1013, 1002,
+
+     1007, 1012, 1011, 1012,    0, 1008,  997, 1003,    0,  990,
+     1003, 1059, 1229,  992, 1055, 1056,  997, 1054, 1229,  995,
+      995, 1049,  985,  319, 1229,  316, 1229,  323,    0, 1004,
+     1007,    0,  976,  974,  974,  234,  991,  394,  974,  987,
+      971,  976,  982,  977,  349,  971,  965,  969,  979,  976,
+      961,  978,    0,    0,    0,  964,  965,  971,  961,    0,
+        0,  969,  954,  963,  957,    0,  966,  963,  965,  948,
+      958,  961,  959,    0,  949,  953,    0,  956, 1012, 1011,
+     1229, 1010,  387,  951,  389,  955,  996,  990, 1229,  983,
+      959,  985,  938,  929,  928,  945,  942,  417,  945,  935,
+
+      931,  923,  923,  926,  925,  971,  968,  916,  918,  929,
+      932,  917,  965,  911,  909,  909,    0,    0,    0,  922,
+      923,    0,    0,    0,    0,    0,    0,  925,  918,  918,
+      910,  971,  972, 1229,  971, 1229,  421,  425,  427,  413,
+      968, 1229,  948,  946,  948,  902,  896,  898,  899,  910,
+      894,  439,  906,    0,    0,  891,  888,  900,  933,    0,
+      891,  893,  897,  888,  893,  931,  888,  891,    0,  878,
+      875,  881,  942,  887,  885,    0,  889,  940,  448, 1229,
+      333,  450,  454,  939,  938,  885,  915,  912,    0,  868,
+      863,  875,  867,  866,  456,  857,  871,  866,  874,  873,
+
+      860,  868,  870,  857,    0,  897,  855,    0,    0,    0,
+      851,  862,    0,    0,  907,  878,  414,  862,  913,  460,
+     1229,  370,  912, 1229,  911, 1229,  877,  857,    0,    0,
+      840,    0,  840,  853,  853,  837,  832,  847,  834,  848,
+      828,    0,  827,  845,    0,  844,  838,  839,  833, 1229,
+      883,  852,  428,  853,  442,  847,  855,  830,  831,  814,
+      811,  819,  825,  462,  815,    0,    0,  828,    0,  808,
+      826,  824,  823,  823,  443,  835,  444,  832,  830,  816,
+      817,  808,  801,  814,  814,  466,  809,  812,  811,    0,
+      810,  797,  791,  815,  463,  806,  466,  813,  815,  794,
+
+      790,  789,  788,  780,  798,    0,  839,  459,  796,    0,
+        0,    0,  845,  813,  332,  801,  470,  799,  799,  784,
+        0,  784,  787,  778,    0, 1229,  462,    0,  786,  806,
+      474,  803,  476,  804,  789,  772, 1229,  761,  767,  468,
+      778,  788,  480,  797,  482,  786,  795,  768,  763,  766,
+      471,  752,  780,  484,  779,  485,  774,  777,  761,  752,
+     1229,  476,  744,  779,  487,  755,  491,    0,  706,    0,
+      693,  482,  696,  705,  493,  712,  488,    0,  694,  479,
+      668,  585,  494,  593,  496,  561,  487,  542,  516,  499,
+      512,  501, 1229,  493,  505,  541,  555,  500,  504,  307,
+
+      496,  547,  545, 1229,  542,  538, 1229,  559,  563,  524,
+      480,  527,  524, 1229,  520,  519, 1229,  507,  505,  441,
+      500,  428,  337,  303,  234,  237,  144,  114,   92, 1229,
+     1229,  568,  578,  588,  593,  603,  608,  617,  627,  636,
+      646,  656,  666,  676,  686,  696,  700,  710,  720,  730,
+      737,  746,  756,  766,  776,  786,  796,  806
     } ;
 
-static yyconst flex_int16_t yy_def[736] =
+static yyconst flex_int16_t yy_def[759] =
     {   0,
-      708,    1,  708,  708,  708,  709,  708,  710,  708,  708,
-      708,  711,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  712,  712,
-      712,  712,  712,  708,  708,  708,  708,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  708,  708,  708,  708,  708,  709,  708,
-      710,  708,  710,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  711,  708,  711,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  713,  708,   84,   21,   22,
-      708,  708,  708,  714,  708,  708,  708,  708,  708,  708,
-
-      708,  708,  712,  712,  712,  715,  716,  712,  708,  708,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  717,  713,  708,  708,
-      708,  708,  708,  708,  708,  714,  708,  708,  712,  712,
-      715,  708,  715,  716,  708,  716,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  718,  708,
-      708,  708,  708,  719,  708,  708,  708,  708,  708,  708,
-      717,  708,  708,  708,  708,  708,  708,  708,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-
-      712,  712,  712,  712,  712,  718,  708,  708,  708,  720,
-      708,  719,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  708,
-      721,  720,  708,  722,  708,  708,  708,  708,  708,  708,
-      708,  712,  712,  712,  712,  712,  712,  712,  708,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  708,  721,  708,  722,  708,  708,  723,  708,  708,
-      708,  708,  712,  712,  712,  712,  712,  712,  712,  708,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  724,  708,  723,  723,  708,  723,  708,
-      725,  726,  727,  712,  712,  712,  712,  712,  712,  712,
-      708,  708,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  712,  708,  712,  712,
-
-      728,  708,  723,  708,  725,  725,  708,  725,  726,  708,
-      727,  708,  712,  712,  712,  712,  712,  712,  708,  708,
-      708,  712,  712,  712,  712,  712,  712,  712,  712,  712,
-      712,  712,  708,  708,  728,  708,  723,  708,  725,  712,
-      712,  712,  708,  708,  708,  712,  712,  712,  712,  712,
-      712,  712,  712,  712,  708,  708,  723,  708,  725,  712,
-      712,  712,  708,  708,  708,  712,  708,  729,  712,  712,
-      712,  712,  708,  708,  723,  708,  725,  712,  712,  712,
-      708,  708,  708,  712,  729,  729,  729,  712,  712,  712,
-      708,  708,  723,  708,  725,  712,  712,  712,  708,  708,
-
-      708,  712,  708,  729,  712,  708,  708,  723,  708,  725,
-      712,  712,  712,  708,  708,  708,  729,  708,  708,  723,
-      708,  725,  712,  712,  712,  708,  708,  729,  708,  708,
-      723,  708,  725,  712,  712,  712,  708,  708,  729,  708,
-      708,  723,  708,  725,  712,  712,  712,  708,  729,  708,
-      708,  723,  708,  725,  712,  708,  729,  708,  708,  723,
-      708,  725,  708,  729,  708,  708,  723,  708,  725,  708,
-      729,  708,  730,  731,  708,  725,  729,  708,  730,  730,
-      708,  731,  731,  708,  732,  733,  734,  708,  732,  732,
-      708,  733,  733,  708,  734,  734,  708,  734,  708,  708,
-
-      708,  708,  708,  708,  735,  735,  708,    0,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708
+      731,    1,  731,  731,  731,  732,  731,  733,  731,  731,
+      731,  734,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  735,  735,
+      735,  735,  735,  731,  731,  731,  731,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  731,  731,  731,  731,  731,  732,  731,
+      733,  731,  733,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  734,  731,  734,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  736,  731,   84,   21,   22,
+      731,  731,  731,  737,  731,  731,  731,  731,  731,  731,
+
+      731,  731,  735,  735,  735,  738,  739,  735,  731,  731,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  740,  736,
+      731,  731,  731,  731,  731,  731,  731,  737,  731,  731,
+      735,  735,  738,  731,  738,  739,  731,  739,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  741,  731,  731,  731,  731,  742,  731,  731,
+      731,  731,  731,  731,  740,  731,  731,  731,  731,  731,
+      731,  731,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  741,  731,  731,  731,  743,  731,  742,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  731,  744,  743,
+      731,  745,  731,  731,  731,  731,  731,  731,  731,  735,
+      735,  735,  735,  735,  735,  735,  735,  731,  735,  735,
+
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  731,  744,  731,  745,  731,  731,  746,  731,  731,
+      731,  731,  735,  735,  735,  735,  735,  735,  735,  735,
+      731,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  747,  731,  746,  746,  731,
+      746,  731,  748,  749,  750,  735,  735,  735,  735,  735,
+      735,  735,  735,  731,  731,  735,  735,  735,  735,  735,
+
+      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  731,  735,  735,  751,  731,  746,  731,  748,  748,
+      731,  748,  749,  731,  750,  731,  735,  735,  735,  735,
+      735,  735,  735,  731,  731,  731,  735,  735,  735,  735,
+      735,  735,  735,  735,  735,  735,  735,  735,  731,  731,
+      751,  731,  746,  731,  748,  735,  735,  735,  735,  731,
+      731,  731,  735,  735,  735,  735,  735,  735,  735,  735,
+      735,  735,  731,  731,  746,  731,  748,  735,  735,  735,
+      735,  731,  731,  731,  735,  731,  752,  735,  735,  735,
+      735,  735,  731,  731,  746,  731,  748,  735,  735,  735,
+
+      735,  731,  731,  731,  735,  752,  752,  752,  735,  735,
+      735,  735,  731,  731,  746,  731,  748,  735,  735,  735,
+      735,  731,  731,  731,  735,  731,  752,  735,  731,  731,
+      746,  731,  748,  735,  735,  735,  731,  731,  731,  752,
+      731,  731,  746,  731,  748,  735,  735,  735,  731,  731,
+      752,  731,  731,  746,  731,  748,  735,  735,  735,  731,
+      731,  752,  731,  731,  746,  731,  748,  735,  735,  735,
+      731,  752,  731,  731,  746,  731,  748,  735,  731,  752,
+      731,  731,  746,  731,  748,  731,  752,  731,  731,  746,
+      731,  748,  731,  752,  731,  753,  754,  731,  748,  752,
+
+      731,  753,  753,  731,  754,  754,  731,  755,  756,  757,
+      731,  755,  755,  731,  756,  756,  731,  757,  757,  731,
+      757,  731,  731,  731,  731,  731,  731,  758,  758,  731,
+        0,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731
     } ;
 
-static yyconst flex_uint16_t yy_nxt[1291] =
+static yyconst flex_uint16_t yy_nxt[1314] =
     {   0,
         4,    5,    6,    5,    5,    7,    8,    9,   10,   11,
        12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
@@ -796,141 +809,145 @@ static yyconst flex_uint16_t yy_nxt[1291] =
        44,   45,   29,   46,   29,   29,   47,   29,   29,   29,
        29,   48,   49,   50,   51,   52,   53,   29,   29,   29,
        54,   55,   56,   57,   58,   62,   58,   58,   64,   70,
-       71,   72,   75,   78,  707,   83,   80,   84,   84,   84,
+       71,   72,   75,   78,  730,   83,   80,   84,   84,   84,
 
        84,   84,   84,   84,   84,   96,  101,  102,   85,   79,
-       81,   82,   73,   86,  106,  115,  165,  116,  107,  111,
-      117,  131,  118,  112,   97,   87,   98,   99,  113,  132,
-       63,  119,  144,   76,  122,  124,   62,  125,  120,  114,
-      165,  139,   65,   66,  123,  121,  126,   67,  140,   58,
-       68,   58,   58,  172,   69,   88,  127,   89,   89,   89,
-       89,   89,   89,   90,   90,  135,  136,  128,   75,  148,
-      129,  149,  707,  180,  156,   91,  137,  156,  181,  138,
-       92,   63,  217,  145,  705,  175,   93,   94,  146,  146,
-      146,  146,  146,  146,  146,  146,  210,   91,  173,  224,
-
-      218,  219,  157,  211,   92,  163,  234,  159,  225,   76,
-      244,  164,   93,  160,  708,   94,   88,  220,   90,   90,
-       90,   90,   90,   90,   90,   90,  176,  226,  175,  163,
-      227,  159,  603,  164,  244,  231,   91,  164,  246,  160,
-      242,   92,  708,  161,  232,  161,  243,   93,  162,  162,
-      162,  162,  162,  162,  162,  162,  213,  243,   91,  164,
-      235,  321,  246,  255,  242,   92,  256,  214,  215,  176,
-      236,  172,  243,   93,   84,   84,   84,   84,   84,   84,
-       84,   84,  182,  243,  183,  184,  185,  321,  247,  229,
-      186,  628,  154,  155,  248,  187,  704,  155,  188,  189,
-
-      190,  191,  192,  193,  146,  146,  146,  146,  146,  146,
-      146,  146,  247,  703,  154,  155,  173,  239,  468,  239,
-      248,  155,  240,  240,  240,  240,  240,  240,  240,  240,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  250,  258,  259,  260,
-      278,  279,  267,  251,  387,  388,  319,  245,  322,  631,
-      261,  245,  268,  240,  240,  240,  240,  240,  240,  240,
-      240,  240,  240,  240,  240,  240,  240,  240,  240,  245,
-      319,  320,  322,  379,  337,  245,  379,  321,  702,  397,
-      155,  338,  381,  398,  155,  380,  389,  427,  389,  389,
-
-      428,  389,  468,  389,  389,  320,  427,  467,  468,  427,
-      467,  470,  155,  321,  471,  472,  381,  507,  155,  430,
-      430,  430,  430,  430,  430,  430,  430,  468,  468,  507,
-      430,  430,  430,  430,  430,  430,  430,  430,  482,  468,
-      482,  482,  467,  468,  470,  467,  507,  470,  468,  390,
-      506,  507,  507,  506,  503,  482,  468,  482,  482,  465,
-      469,  507,  506,  507,  537,  506,  559,  557,  567,  539,
-      567,  567,  603,  567,  603,  440,  468,  507,  568,  603,
-      585,  507,  468,  507,  507,  577,  603,  468,  603,  608,
-      603,  575,  593,  468,  468,  469,  507,  504,  603,  507,
-
-      468,  507,  603,  508,  595,  610,  507,  620,  520,  701,
-      622,  700,  633,  680,  681,  508,  680,  683,  684,  604,
-      683,  698,  652,  642,  644,  654,  639,  687,  603,  521,
-      699,  649,  617,  657,  662,  698,  660,  690,  691,  669,
-      690,  693,  694,  696,  693,  671,  667,  694,  677,  664,
-      694,  691,  674,  676,  691,  697,  696,  684,  686,   59,
-       59,  684,   59,   59,   59,   59,   59,   59,   59,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   74,
-       74,   74,   74,   74,   74,   74,   74,   74,   74,  103,
-      103,  103,  103,  103,  158,  158,  681,  158,  158,  158,
-
-      158,  158,  158,  158,  166,  166,  681,  166,  171,  171,
-      171,  171,  171,  171,  171,  171,  171,  171,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  241,  688,
-      685,  241,  241,  241,  241,  241,  241,  306,  306,  306,
-      306,  306,  306,  306,  306,  306,  306,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  372,  372,  372,
-      372,  372,  372,  372,  372,  372,  372,  423,  423,  423,
-      423,  423,  423,  423,  423,  423,  423,  425,  425,  425,
-      425,  425,  425,  425,  425,  425,  425,  466,  466,  466,
-      466,  466,  466,  466,  466,  466,  466,  501,  501,  501,
-
-      501,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  535,  678,  535,  535,  535,  535,  535,  586,  675,
-      673,  672,  670,  668,  666,  586,  586,  679,  679,  679,
-      679,  679,  679,  679,  679,  679,  679,  682,  682,  682,
-      682,  682,  682,  682,  682,  682,  682,  689,  689,  689,
-      689,  689,  689,  689,  689,  689,  689,  692,  692,  692,
-      692,  692,  692,  692,  692,  692,  692,  695,  695,  665,
-      695,  695,  695,  695,  695,  695,  695,  706,  706,  706,
-
-      706,  706,  706,  706,  706,  706,  706,  663,  661,  659,
-      658,  656,  655,  653,  651,  650,  648,  647,  646,  645,
-      643,  641,  640,  638,  637,  636,  635,  634,  632,  630,
-      629,  627,  626,  625,  624,  623,  621,  619,  618,  616,
-      615,  614,  613,  612,  611,  609,  607,  606,  605,  603,
-      602,  601,  600,  599,  598,  597,  596,  594,  592,  591,
-      590,  589,  588,  587,  584,  583,  582,  581,  580,  579,
-      578,  576,  574,  573,  572,  571,  570,  569,  566,  565,
-      564,  563,  562,  561,  560,  558,  556,  534,  555,  554,
-      553,  552,  551,  550,  549,  548,  547,  546,  545,  544,
-
-      543,  542,  541,  540,  512,  510,  507,  538,  536,  534,
-      533,  532,  531,  530,  529,  528,  527,  526,  525,  524,
-      523,  522,  519,  518,  517,  516,  515,  514,  513,  512,
-      510,  468,  502,  500,  499,  498,  497,  496,  495,  494,
-      493,  492,  491,  490,  489,  488,  487,  486,  485,  484,
-      483,  481,  480,  479,  478,  477,  476,  475,  474,  473,
-      426,  424,  464,  463,  462,  461,  460,  459,  458,  457,
-      456,  455,  454,  453,  452,  451,  450,  449,  448,  447,
-      446,  445,  444,  443,  442,  441,  439,  438,  437,  436,
-      435,  434,  433,  432,  380,  431,  429,  426,  373,  424,
-
-      422,  421,  420,  419,  418,  417,  416,  415,  414,  413,
-      412,  411,  410,  409,  408,  407,  406,  405,  404,  403,
-      402,  401,  400,  399,  396,  395,  394,  393,  392,  391,
-      386,  385,  384,  383,  382,  378,  377,  376,  375,  313,
-      374,  373,  371,  370,  307,  369,  368,  367,  366,  365,
-      364,  363,  362,  361,  360,  359,  358,  357,  356,  355,
-      354,  353,  352,  351,  350,  349,  348,  347,  346,  345,
-      344,  343,  342,  341,  340,  339,  336,  335,  334,  333,
-      332,  331,  330,  329,  328,  327,  326,  325,  324,  323,
-      318,  317,  316,  315,  314,  313,  311,  310,  309,  308,
-
-      307,  305,  304,  303,  302,  301,  300,  299,  298,  297,
-      296,  295,  294,  293,  292,  291,  290,  289,  288,  287,
-      286,  285,  284,  283,  282,  281,  280,  277,  276,  275,
-      274,  273,  272,  271,  270,  269,  266,  265,  264,  263,
-      262,  257,  254,  253,  252,  708,  708,  249,  157,  238,
-      237,  233,  230,  228,  223,  222,  221,  216,  212,  209,
-      208,  207,  206,  205,  204,  203,  202,  201,  200,  199,
-      198,  197,  196,  195,  194,  179,  178,  177,  170,  169,
-      168,  167,  153,  708,  152,  151,  150,  147,  708,  143,
-      142,  141,  134,  133,  130,  110,  109,  108,  105,  104,
-
-      100,   95,   77,   60,  708,    3,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708
+       81,   82,   73,   86,  106,  116,  730,  117,  107,  111,
+      118,  132,  119,  112,   97,   87,   98,   99,  113,  133,
+       63,  120,  114,   76,  123,  125,   62,  126,  121,  115,
+      146,   75,   65,   66,  124,  122,  127,   67,  167,   58,
+       68,   58,   58,  174,   69,   88,  128,   89,   89,   89,
+       89,   89,   89,   90,   90,  136,  137,  129,  140,  150,
+      130,  151,  167,  177,  220,   91,  138,  141,  182,  139,
+       92,   63,   76,  183,  142,  158,   93,   94,  158,  213,
+      216,  147,  221,  222,  228,  174,  214,   91,  175,  265,
+
+      254,  217,  218,  229,   92,  230,  238,  255,  231,  223,
+      266,  248,   93,  159,  178,   94,   88,  728,   90,   90,
+       90,   90,   90,   90,   90,   90,  148,  148,  148,  148,
+      148,  148,  148,  148,  233,  248,   91,  161,  166,  165,
+      175,   92,  250,  162,  731,  166,  177,   93,  235,  148,
+      148,  148,  148,  148,  148,  148,  148,  236,   91,  259,
+      239,  161,  260,  165,  166,   92,  250,  263,  264,  162,
+      240,  166,  731,   93,   84,   84,   84,   84,   84,   84,
+       84,   84,  283,  284,  246,  272,  325,  178,  395,  396,
+      247,  727,  156,  157,  163,  273,  163,  157,  247,  164,
+
+      164,  164,  164,  164,  164,  164,  164,  726,  246,  185,
+      325,  186,  187,  188,  156,  157,  247,  189,  710,  626,
+      387,  157,  190,  387,  247,  191,  192,  193,  194,  195,
+      196,  243,  388,  243,  480,  480,  244,  244,  244,  244,
+      244,  244,  244,  244,  164,  164,  164,  164,  164,  164,
+      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
+      251,  328,  326,  344,  327,  389,  252,  631,  327,  406,
+      345,  249,  521,  407,  725,  249,  244,  244,  244,  244,
+      244,  244,  244,  244,  251,  328,  326,  517,  437,  389,
+      327,  438,  252,  249,  327,  398,  724,  398,  398,  249,
+
+      244,  244,  244,  244,  244,  244,  244,  244,  440,  440,
+      440,  440,  440,  440,  440,  440,  480,  484,  398,  157,
+      398,  398,  437,  157,  555,  437,  479,  480,  482,  479,
+      480,  483,  440,  440,  440,  440,  440,  440,  440,  440,
+      495,  157,  495,  495,  521,  480,  521,  157,  399,  479,
+      480,  482,  479,  553,  482,  520,  521,  495,  520,  495,
+      495,  520,  521,  586,  520,  480,  586,  586,  521,  575,
+      586,  626,  521,  587,  626,  477,  480,  606,  521,  481,
+      626,  577,  480,  626,  521,  597,  480,  521,  626,  480,
+      521,  626,  451,  521,  626,  480,  480,  595,  521,  626,
+
+      723,  480,  481,  521,  518,  626,  521,  643,  522,  615,
+      535,  645,  721,  722,  522,  656,  633,  721,  627,  719,
+      617,  717,  717,  654,  675,  685,  714,  665,  667,  714,
+      662,  536,  640,  672,  677,  720,  719,  680,  683,  651,
+      707,  692,  703,  704,  707,  703,  694,  704,  690,  704,
+      711,  700,  687,  697,  708,  699,  706,  707,  709,  706,
+      713,  714,  701,  713,  716,  717,  698,  716,   59,   59,
+      696,   59,   59,   59,   59,   59,   59,   59,   61,   61,
+       61,   61,   61,   61,   61,   61,   61,   61,   74,   74,
+       74,   74,   74,   74,   74,   74,   74,   74,  103,  103,
+
+      103,  103,  103,  160,  160,  695,  160,  160,  160,  160,
+      160,  160,  160,  168,  168,  693,  168,  173,  173,  173,
+      173,  173,  173,  173,  173,  173,  173,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  245,  691,  689,
+      245,  245,  245,  245,  245,  245,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  318,  318,  318,  318,
+      318,  318,  318,  318,  318,  318,  380,  380,  380,  380,
+      380,  380,  380,  380,  380,  380,  433,  433,  433,  433,
+      433,  433,  433,  433,  433,  433,  435,  435,  435,  435,
+      435,  435,  435,  435,  435,  435,  478,  478,  478,  478,
+
+      478,  478,  478,  478,  478,  478,  515,  515,  515,  515,
+      519,  519,  519,  519,  519,  519,  519,  519,  519,  519,
+      523,  523,  523,  523,  523,  523,  523,  523,  523,  523,
+      525,  525,  525,  525,  525,  525,  525,  525,  525,  525,
+      551,  688,  551,  551,  551,  551,  551,  607,  686,  684,
+      682,  681,  679,  678,  607,  607,  702,  702,  702,  702,
+      702,  702,  702,  702,  702,  702,  705,  705,  705,  705,
+      705,  705,  705,  705,  705,  705,  712,  712,  712,  712,
+      712,  712,  712,  712,  712,  712,  715,  715,  715,  715,
+      715,  715,  715,  715,  715,  715,  718,  718,  676,  718,
+
+      718,  718,  718,  718,  718,  718,  729,  729,  729,  729,
+      729,  729,  729,  729,  729,  729,  674,  673,  671,  670,
+      669,  668,  666,  664,  663,  661,  660,  659,  658,  657,
+      655,  653,  652,  650,  649,  648,  647,  646,  644,  642,
+      641,  639,  638,  637,  636,  635,  634,  632,  630,  629,
+      628,  626,  625,  624,  623,  622,  621,  620,  619,  618,
+      616,  614,  613,  612,  611,  610,  609,  608,  605,  604,
+      603,  602,  601,  600,  599,  598,  596,  594,  593,  592,
+      591,  590,  589,  588,  585,  584,  583,  582,  581,  580,
+      579,  578,  576,  574,  550,  573,  572,  571,  570,  569,
+
+      568,  567,  566,  565,  564,  563,  562,  561,  560,  559,
+      558,  557,  556,  526,  524,  521,  554,  552,  550,  549,
+      548,  547,  546,  545,  544,  543,  542,  541,  540,  539,
+      538,  537,  534,  533,  532,  531,  530,  529,  528,  527,
+      526,  524,  480,  516,  514,  513,  512,  511,  510,  509,
+      508,  507,  506,  505,  504,  503,  502,  501,  500,  499,
+      498,  497,  496,  494,  493,  492,  491,  490,  489,  488,
+      487,  486,  485,  436,  434,  476,  475,  474,  473,  472,
+      471,  470,  469,  468,  467,  466,  465,  464,  463,  462,
+      461,  460,  459,  458,  457,  456,  455,  454,  453,  452,
+
+      450,  449,  448,  447,  446,  445,  444,  443,  442,  388,
+      441,  439,  436,  381,  434,  432,  431,  430,  429,  428,
+      427,  426,  425,  424,  423,  422,  421,  420,  419,  418,
+      417,  416,  415,  414,  413,  412,  411,  410,  409,  408,
+      405,  404,  403,  402,  401,  400,  397,  394,  393,  392,
+      391,  390,  386,  385,  384,  383,  319,  382,  381,  379,
+      378,  313,  377,  376,  375,  374,  373,  372,  371,  370,
+      369,  368,  367,  366,  365,  364,  363,  362,  361,  360,
+      359,  358,  357,  356,  355,  354,  353,  352,  351,  350,
+      349,  348,  347,  346,  343,  342,  341,  340,  339,  338,
+
+      337,  336,  335,  334,  333,  332,  331,  330,  329,  324,
+      323,  322,  321,  320,  319,  317,  316,  315,  314,  313,
+      311,  310,  309,  308,  307,  306,  305,  304,  303,  302,
+      301,  300,  299,  298,  297,  296,  295,  294,  293,  292,
+      291,  290,  289,  288,  287,  286,  285,  282,  281,  280,
+      279,  278,  277,  276,  275,  274,  271,  270,  269,  268,
+      267,  262,  261,  258,  257,  256,  731,  731,  253,  159,
+      242,  241,  237,  234,  232,  227,  226,  225,  224,  219,
+      215,  212,  211,  210,  209,  208,  207,  206,  205,  204,
+      203,  202,  201,  200,  199,  198,  197,  184,  181,  180,
+
+      179,  172,  171,  170,  169,  155,  731,  154,  153,  152,
+      149,  731,  145,  144,  143,  135,  134,  131,  110,  109,
+      108,  105,  104,  100,   95,   77,   60,  731,    3,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731
     } ;
 
-static yyconst flex_int16_t yy_chk[1291] =
+static yyconst flex_int16_t yy_chk[1314] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -941,138 +958,142 @@ static yyconst flex_int16_t yy_chk[1291] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    5,    8,    5,    5,    9,   10,
-       10,   11,   12,   16,  706,   19,   18,   19,   19,   19,
+       10,   11,   12,   16,  729,   19,   18,   19,   19,   19,
 
        19,   19,   19,   19,   19,   25,   27,   27,   20,   16,
-       18,   18,   11,   20,   32,   39,   93,   39,   32,   38,
+       18,   18,   11,   20,   32,   39,  728,   39,   32,   38,
        40,   46,   40,   38,   25,   20,   25,   25,   38,   46,
-        8,   41,   55,   12,   42,   43,   61,   43,   41,   38,
-       93,   50,    9,    9,   42,   41,   43,    9,   50,   58,
+        8,   41,   38,   12,   42,   43,   61,   43,   41,   38,
+       55,   74,    9,    9,   42,   41,   43,    9,   93,   58,
         9,   58,   58,  106,    9,   21,   44,   21,   21,   21,
-       21,   21,   21,   21,   21,   49,   49,   44,   74,   66,
-       44,   66,  705,  113,   85,   21,   49,   85,  113,   49,
-       21,   61,  136,   55,  704,  107,   21,   21,   64,   64,
-       64,   64,   64,   64,   64,   64,  132,   21,  106,  141,
-
-      136,  137,   85,  132,   21,   92,  150,   89,  141,   74,
-      160,   92,   21,   89,   89,   21,   22,  137,   22,   22,
-       22,   22,   22,   22,   22,   22,  107,  142,  174,   92,
-      142,   89,  617,  163,  160,  148,   22,   92,  165,   89,
-      159,   22,   89,   91,  148,   91,  159,   22,   91,   91,
-       91,   91,   91,   91,   91,   91,  134,  242,   22,  163,
-      150,  320,  165,  180,  159,   22,  180,  134,  134,  174,
-      150,  171,  159,   22,   84,   84,   84,   84,   84,   84,
-       84,   84,  114,  242,  114,  114,  114,  320,  166,  146,
-      114,  617,   84,   84,  166,  114,  703,   84,  114,  114,
-
-      114,  114,  114,  114,  146,  146,  146,  146,  146,  146,
-      146,  146,  166,  702,   84,   84,  171,  154,  620,  154,
-      166,   84,  154,  154,  154,  154,  154,  154,  154,  154,
-      161,  161,  161,  161,  161,  161,  161,  161,  162,  162,
-      162,  162,  162,  162,  162,  162,  170,  182,  182,  183,
-      200,  200,  189,  170,  330,  330,  244,  162,  248,  620,
-      183,  162,  189,  239,  239,  239,  239,  239,  239,  239,
-      239,  240,  240,  240,  240,  240,  240,  240,  240,  162,
-      244,  247,  248,  318,  264,  162,  318,  247,  701,  338,
-      240,  264,  322,  338,  240,  318,  331,  375,  331,  331,
-
-      375,  389,  469,  389,  389,  247,  427,  428,  428,  427,
-      428,  429,  240,  247,  429,  430,  322,  508,  240,  377,
-      377,  377,  377,  377,  377,  377,  377,  503,  537,  539,
-      430,  430,  430,  430,  430,  430,  430,  430,  441,  557,
-      441,  441,  467,  467,  470,  467,  559,  470,  575,  331,
-      471,  471,  577,  471,  469,  482,  593,  482,  482,  427,
-      428,  595,  506,  506,  503,  506,  539,  537,  547,  508,
-      567,  547,  587,  567,  604,  389,  608,  610,  547,  628,
-      567,  622,  631,  633,  644,  559,  639,  642,  657,  593,
-      649,  557,  575,  652,  660,  467,  662,  470,  664,  654,
-
-      667,  669,  671,  471,  577,  595,  676,  608,  482,  700,
-      610,  699,  622,  673,  673,  506,  673,  674,  674,  587,
-      674,  698,  642,  631,  633,  644,  628,  677,  677,  482,
-      697,  639,  604,  649,  654,  696,  652,  685,  685,  662,
-      685,  686,  686,  695,  686,  664,  660,  693,  671,  657,
-      692,  690,  667,  669,  689,  688,  687,  683,  676,  709,
-      709,  682,  709,  709,  709,  709,  709,  709,  709,  710,
-      710,  710,  710,  710,  710,  710,  710,  710,  710,  711,
-      711,  711,  711,  711,  711,  711,  711,  711,  711,  712,
-      712,  712,  712,  712,  713,  713,  680,  713,  713,  713,
-
-      713,  713,  713,  713,  714,  714,  679,  714,  715,  715,
-      715,  715,  715,  715,  715,  715,  715,  715,  716,  716,
-      716,  716,  716,  716,  716,  716,  716,  716,  717,  678,
-      675,  717,  717,  717,  717,  717,  717,  718,  718,  718,
-      718,  718,  718,  718,  718,  718,  718,  719,  719,  719,
-      719,  719,  719,  719,  719,  719,  719,  720,  720,  720,
-      720,  720,  720,  720,  720,  720,  720,  721,  721,  721,
-      721,  721,  721,  721,  721,  721,  721,  722,  722,  722,
-      722,  722,  722,  722,  722,  722,  722,  723,  723,  723,
-      723,  723,  723,  723,  723,  723,  723,  724,  724,  724,
-
-      724,  725,  725,  725,  725,  725,  725,  725,  725,  725,
-      725,  726,  726,  726,  726,  726,  726,  726,  726,  726,
-      726,  727,  727,  727,  727,  727,  727,  727,  727,  727,
-      727,  728,  672,  728,  728,  728,  728,  728,  729,  668,
-      666,  665,  663,  661,  659,  729,  729,  730,  730,  730,
-      730,  730,  730,  730,  730,  730,  730,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  732,  732,  732,
-      732,  732,  732,  732,  732,  732,  732,  733,  733,  733,
-      733,  733,  733,  733,  733,  733,  733,  734,  734,  658,
-      734,  734,  734,  734,  734,  734,  734,  735,  735,  735,
-
-      735,  735,  735,  735,  735,  735,  735,  656,  653,  651,
-      650,  648,  646,  643,  641,  640,  637,  636,  635,  634,
-      632,  630,  629,  627,  626,  625,  624,  623,  621,  619,
-      618,  616,  615,  613,  612,  611,  609,  607,  606,  601,
-      600,  599,  598,  597,  596,  594,  592,  591,  588,  586,
-      584,  583,  582,  581,  580,  579,  578,  576,  574,  573,
-      572,  570,  569,  568,  566,  565,  564,  563,  562,  561,
-      560,  558,  556,  555,  554,  553,  551,  548,  546,  545,
-      544,  543,  542,  541,  540,  538,  536,  535,  533,  532,
-      531,  529,  528,  526,  525,  524,  523,  522,  521,  520,
-
-      519,  517,  514,  513,  511,  509,  505,  504,  502,  501,
-      498,  494,  493,  491,  490,  489,  488,  487,  486,  485,
-      484,  483,  481,  480,  479,  478,  476,  475,  474,  473,
-      472,  466,  465,  463,  462,  461,  460,  459,  457,  456,
-      455,  454,  453,  452,  451,  450,  448,  447,  446,  445,
-      442,  440,  439,  438,  437,  436,  435,  434,  433,  431,
-      425,  423,  422,  421,  420,  419,  412,  411,  407,  406,
-      405,  404,  403,  402,  401,  400,  399,  398,  397,  396,
-      395,  394,  393,  392,  391,  390,  388,  387,  386,  385,
-      384,  383,  382,  380,  379,  378,  376,  374,  372,  371,
-
-      370,  368,  367,  365,  364,  363,  362,  361,  360,  358,
-      357,  356,  355,  352,  351,  350,  349,  345,  344,  343,
-      342,  341,  340,  339,  337,  336,  335,  334,  333,  332,
-      329,  328,  327,  325,  324,  317,  316,  315,  314,  312,
-      311,  310,  309,  308,  306,  305,  304,  302,  301,  300,
-      298,  297,  296,  295,  294,  293,  292,  291,  290,  288,
-      286,  285,  284,  281,  280,  279,  278,  275,  272,  271,
-      270,  269,  268,  267,  266,  265,  263,  262,  261,  260,
-      259,  258,  257,  256,  255,  254,  253,  251,  250,  249,
-      241,  238,  237,  236,  235,  234,  233,  232,  231,  230,
-
-      229,  228,  227,  226,  225,  224,  223,  222,  221,  220,
-      219,  218,  217,  216,  215,  214,  213,  212,  210,  209,
-      207,  206,  205,  204,  203,  202,  201,  199,  198,  197,
-      196,  195,  193,  192,  191,  190,  188,  187,  186,  185,
-      184,  181,  179,  178,  177,  176,  173,  169,  156,  152,
-      151,  149,  147,  143,  140,  139,  138,  135,  133,  130,
-      129,  128,  127,  126,  125,  124,  123,  122,  121,  120,
-      119,  118,  117,  116,  115,  112,  111,  108,  105,  104,
-      102,   98,   83,   76,   69,   68,   67,   65,   63,   53,
-       52,   51,   48,   47,   45,   37,   35,   33,   31,   30,
-
-       26,   23,   15,    7,    3,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708,
-      708,  708,  708,  708,  708,  708,  708,  708,  708,  708
+       21,   21,   21,   21,   21,   49,   49,   44,   50,   66,
+       44,   66,   93,  107,  137,   21,   49,   50,  113,   49,
+       21,   61,   74,  113,   50,   85,   21,   21,   85,  133,
+      135,   55,  137,  138,  143,  173,  133,   21,  106,  186,
+
+      172,  135,  135,  143,   21,  144,  152,  172,  144,  138,
+      186,  162,   21,   85,  107,   21,   22,  727,   22,   22,
+       22,   22,   22,   22,   22,   22,   64,   64,   64,   64,
+       64,   64,   64,   64,  148,  162,   22,   89,  165,   92,
+      173,   22,  167,   89,   89,   92,  176,   22,  150,  148,
+      148,  148,  148,  148,  148,  148,  148,  150,   22,  182,
+      152,   89,  182,   92,  165,   22,  167,  185,  185,   89,
+      152,   92,   89,   22,   84,   84,   84,   84,   84,   84,
+       84,   84,  203,  203,  161,  192,  248,  176,  336,  336,
+      161,  726,   84,   84,   91,  192,   91,   84,  246,   91,
+
+       91,   91,   91,   91,   91,   91,   91,  725,  161,  115,
+      248,  115,  115,  115,   84,   84,  161,  115,  700,  700,
+      324,   84,  115,  324,  246,  115,  115,  115,  115,  115,
+      115,  156,  324,  156,  615,  481,  156,  156,  156,  156,
+      156,  156,  156,  156,  163,  163,  163,  163,  163,  163,
+      163,  163,  164,  164,  164,  164,  164,  164,  164,  164,
+      168,  252,  251,  269,  326,  328,  168,  615,  251,  345,
+      269,  164,  522,  345,  724,  164,  243,  243,  243,  243,
+      243,  243,  243,  243,  168,  252,  251,  481,  383,  328,
+      326,  383,  168,  164,  251,  338,  723,  338,  338,  164,
+
+      244,  244,  244,  244,  244,  244,  244,  244,  385,  385,
+      385,  385,  385,  385,  385,  385,  517,  440,  398,  244,
+      398,  398,  437,  244,  522,  437,  438,  438,  439,  438,
+      553,  439,  440,  440,  440,  440,  440,  440,  440,  440,
+      452,  244,  452,  452,  555,  575,  577,  244,  338,  479,
+      479,  482,  479,  517,  482,  483,  483,  495,  483,  495,
+      495,  520,  520,  564,  520,  595,  564,  586,  597,  553,
+      586,  608,  617,  564,  627,  437,  631,  586,  633,  438,
+      640,  555,  643,  651,  645,  577,  654,  656,  662,  665,
+      677,  680,  398,  667,  672,  675,  683,  575,  685,  687,
+
+      722,  690,  479,  692,  482,  694,  699,  631,  483,  595,
+      495,  633,  721,  720,  520,  645,  617,  719,  608,  718,
+      597,  716,  715,  643,  665,  677,  713,  654,  656,  712,
+      651,  495,  627,  662,  667,  711,  710,  672,  675,  640,
+      706,  685,  696,  696,  705,  696,  687,  703,  683,  702,
+      701,  694,  680,  690,  698,  692,  697,  697,  699,  697,
+      708,  708,  695,  708,  709,  709,  691,  709,  732,  732,
+      689,  732,  732,  732,  732,  732,  732,  732,  733,  733,
+      733,  733,  733,  733,  733,  733,  733,  733,  734,  734,
+      734,  734,  734,  734,  734,  734,  734,  734,  735,  735,
+
+      735,  735,  735,  736,  736,  688,  736,  736,  736,  736,
+      736,  736,  736,  737,  737,  686,  737,  738,  738,  738,
+      738,  738,  738,  738,  738,  738,  738,  739,  739,  739,
+      739,  739,  739,  739,  739,  739,  739,  740,  684,  682,
+      740,  740,  740,  740,  740,  740,  741,  741,  741,  741,
+      741,  741,  741,  741,  741,  741,  742,  742,  742,  742,
+      742,  742,  742,  742,  742,  742,  743,  743,  743,  743,
+      743,  743,  743,  743,  743,  743,  744,  744,  744,  744,
+      744,  744,  744,  744,  744,  744,  745,  745,  745,  745,
+      745,  745,  745,  745,  745,  745,  746,  746,  746,  746,
+
+      746,  746,  746,  746,  746,  746,  747,  747,  747,  747,
+      748,  748,  748,  748,  748,  748,  748,  748,  748,  748,
+      749,  749,  749,  749,  749,  749,  749,  749,  749,  749,
+      750,  750,  750,  750,  750,  750,  750,  750,  750,  750,
+      751,  681,  751,  751,  751,  751,  751,  752,  679,  676,
+      674,  673,  671,  669,  752,  752,  753,  753,  753,  753,
+      753,  753,  753,  753,  753,  753,  754,  754,  754,  754,
+      754,  754,  754,  754,  754,  754,  755,  755,  755,  755,
+      755,  755,  755,  755,  755,  755,  756,  756,  756,  756,
+      756,  756,  756,  756,  756,  756,  757,  757,  666,  757,
+
+      757,  757,  757,  757,  757,  757,  758,  758,  758,  758,
+      758,  758,  758,  758,  758,  758,  664,  663,  660,  659,
+      658,  657,  655,  653,  652,  650,  649,  648,  647,  646,
+      644,  642,  641,  639,  638,  636,  635,  634,  632,  630,
+      629,  624,  623,  622,  620,  619,  618,  616,  614,  613,
+      609,  607,  605,  604,  603,  602,  601,  600,  599,  598,
+      596,  594,  593,  592,  591,  589,  588,  587,  585,  584,
+      583,  582,  581,  580,  579,  578,  576,  574,  573,  572,
+      571,  570,  568,  565,  563,  562,  561,  560,  559,  558,
+      557,  556,  554,  552,  551,  549,  548,  547,  546,  544,
+
+      543,  541,  540,  539,  538,  537,  536,  535,  534,  533,
+      531,  528,  527,  525,  523,  519,  518,  516,  515,  512,
+      511,  507,  506,  504,  503,  502,  501,  500,  499,  498,
+      497,  496,  494,  493,  492,  491,  490,  488,  487,  486,
+      485,  484,  478,  477,  475,  474,  473,  472,  471,  470,
+      468,  467,  466,  465,  464,  463,  462,  461,  459,  458,
+      457,  456,  453,  451,  450,  449,  448,  447,  446,  445,
+      444,  443,  441,  435,  433,  432,  431,  430,  429,  428,
+      421,  420,  416,  415,  414,  413,  412,  411,  410,  409,
+      408,  407,  406,  405,  404,  403,  402,  401,  400,  399,
+
+      397,  396,  395,  394,  393,  392,  391,  390,  388,  387,
+      386,  384,  382,  380,  379,  378,  376,  375,  373,  372,
+      371,  370,  369,  368,  367,  365,  364,  363,  362,  359,
+      358,  357,  356,  352,  351,  350,  349,  348,  347,  346,
+      344,  343,  342,  341,  340,  339,  337,  335,  334,  333,
+      331,  330,  323,  322,  321,  320,  318,  317,  316,  315,
+      314,  312,  311,  310,  308,  307,  306,  304,  303,  302,
+      301,  300,  299,  298,  297,  296,  295,  293,  291,  290,
+      289,  286,  285,  284,  283,  280,  277,  276,  275,  274,
+      273,  272,  271,  270,  268,  267,  266,  265,  264,  263,
+
+      262,  261,  260,  259,  258,  257,  255,  254,  253,  245,
+      242,  241,  240,  239,  238,  237,  236,  235,  234,  233,
+      232,  231,  230,  229,  228,  227,  226,  225,  224,  223,
+      222,  221,  220,  219,  218,  217,  216,  215,  213,  212,
+      210,  209,  208,  207,  206,  205,  204,  202,  201,  200,
+      199,  198,  196,  195,  194,  193,  191,  190,  189,  188,
+      187,  184,  183,  181,  180,  179,  178,  175,  171,  158,
+      154,  153,  151,  149,  145,  142,  141,  140,  139,  136,
+      134,  131,  130,  129,  128,  127,  126,  125,  124,  123,
+      122,  121,  120,  119,  118,  117,  116,  114,  112,  111,
+
+      108,  105,  104,  102,   98,   83,   76,   69,   68,   67,
+       65,   63,   53,   52,   51,   48,   47,   45,   37,   35,
+       33,   31,   30,   26,   23,   15,    7,    3,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+
+      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
+      731,  731,  731
     } ;
 
 extern int yy_flex_debug;
@@ -1163,7 +1184,7 @@ static void print_error (GISourceScanner *scanner);
 #define IS_EOF EOF
 #endif
 
-#line 1167 "scannerlexer.c"
+#line 1188 "giscanner/scannerlexer.c"
 
 #define INITIAL 0
 
@@ -1388,7 +1409,7 @@ YY_DECL
 #line 82 "giscanner/scannerlexer.l"
 
 
-#line 1392 "scannerlexer.c"
+#line 1413 "giscanner/scannerlexer.c"
 
        while ( /*CONSTCOND*/1 )                /* loops until end-of-file is reached */
                {
@@ -1414,14 +1435,14 @@ yy_match:
                        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                                {
                                yy_current_state = (int) yy_def[yy_current_state];
-                               if ( yy_current_state >= 709 )
+                               if ( yy_current_state >= 732 )
                                        yy_c = yy_meta[(unsigned int) yy_c];
                                }
                        yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
                        *(yy_state_ptr)++ = yy_current_state;
                        ++yy_cp;
                        }
-               while ( yy_base[yy_current_state] != 1206 );
+               while ( yy_base[yy_current_state] != 1229 );
 
 yy_find_action:
                yy_current_state = *--(yy_state_ptr);
@@ -1919,38 +1940,38 @@ YY_RULE_SETUP
 case 91:
 YY_RULE_SETUP
 #line 184 "giscanner/scannerlexer.l"
-{ if (!parse_ignored_macro()) REJECT; }
+{ return THREAD_LOCAL; }
        YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 185 "giscanner/scannerlexer.l"
-{ return VOLATILE; }
+{ return THREAD_LOCAL; }
        YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 186 "giscanner/scannerlexer.l"
-{ return VOLATILE; }
+{ if (!parse_ignored_macro()) REJECT; }
        YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 187 "giscanner/scannerlexer.l"
-{ return BOOL; }
+{ return VOLATILE; }
        YY_BREAK
 case 95:
-/* rule 95 can match eol */
 YY_RULE_SETUP
 #line 188 "giscanner/scannerlexer.l"
-{ ++lineno; /* Ignore */ }
+{ return VOLATILE; }
        YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 189 "giscanner/scannerlexer.l"
-{ /* Ignore */ }
+{ return BOOL; }
        YY_BREAK
 case 97:
+/* rule 97 can match eol */
 YY_RULE_SETUP
 #line 190 "giscanner/scannerlexer.l"
-{ /* Ignore */ }
+{ ++lineno; /* Ignore */ }
        YY_BREAK
 case 98:
 YY_RULE_SETUP
@@ -1960,42 +1981,42 @@ YY_RULE_SETUP
 case 99:
 YY_RULE_SETUP
 #line 192 "giscanner/scannerlexer.l"
-{ /* ignore */ }
+{ /* Ignore */ }
        YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 193 "giscanner/scannerlexer.l"
-{ /* ignore */ }
+{ /* Ignore */ }
        YY_BREAK
 case 101:
 YY_RULE_SETUP
 #line 194 "giscanner/scannerlexer.l"
-{ return INT; }
+{ /* ignore */ }
        YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 195 "giscanner/scannerlexer.l"
-{ return FLOAT; }
+{ /* ignore */ }
        YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 197 "giscanner/scannerlexer.l"
-{ return INTL_CONST; }
+#line 196 "giscanner/scannerlexer.l"
+{ return INT; }
        YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 198 "giscanner/scannerlexer.l"
-{ return INTUL_CONST; }
+#line 197 "giscanner/scannerlexer.l"
+{ return FLOAT; }
        YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 200 "giscanner/scannerlexer.l"
-{ return BOOLEAN; }
+#line 199 "giscanner/scannerlexer.l"
+{ return INTL_CONST; }
        YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 201 "giscanner/scannerlexer.l"
-{ return BOOLEAN; }
+#line 200 "giscanner/scannerlexer.l"
+{ return INTUL_CONST; }
        YY_BREAK
 case 107:
 YY_RULE_SETUP
@@ -2009,113 +2030,113 @@ YY_RULE_SETUP
        YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 205 "giscanner/scannerlexer.l"
-{ if (scanner->macro_scan) return check_identifier(scanner, yytext); else REJECT; }
+#line 204 "giscanner/scannerlexer.l"
+{ return BOOLEAN; }
        YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 207 "giscanner/scannerlexer.l"
-{ if (!parse_ignored_macro()) REJECT; }
+#line 205 "giscanner/scannerlexer.l"
+{ return BOOLEAN; }
        YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 208 "giscanner/scannerlexer.l"
-{ return AUTO; }
+#line 207 "giscanner/scannerlexer.l"
+{ if (scanner->macro_scan) return check_identifier(scanner, yytext); else REJECT; }
        YY_BREAK
 case 112:
 YY_RULE_SETUP
 #line 209 "giscanner/scannerlexer.l"
-{ return BOOL; }
+{ if (!parse_ignored_macro()) REJECT; }
        YY_BREAK
 case 113:
 YY_RULE_SETUP
 #line 210 "giscanner/scannerlexer.l"
-{ return BREAK; }
+{ return AUTO; }
        YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 211 "giscanner/scannerlexer.l"
-{ return CASE; }
+{ return BOOL; }
        YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 212 "giscanner/scannerlexer.l"
-{ return CHAR; }
+{ return BREAK; }
        YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 213 "giscanner/scannerlexer.l"
-{ return CONST; }
+{ return CASE; }
        YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 214 "giscanner/scannerlexer.l"
-{ return CONTINUE; }
+{ return CHAR; }
        YY_BREAK
 case 118:
 YY_RULE_SETUP
 #line 215 "giscanner/scannerlexer.l"
-{ return DEFAULT; }
+{ return CONST; }
        YY_BREAK
 case 119:
 YY_RULE_SETUP
 #line 216 "giscanner/scannerlexer.l"
-{ return DO; }
+{ return CONTINUE; }
        YY_BREAK
 case 120:
 YY_RULE_SETUP
 #line 217 "giscanner/scannerlexer.l"
-{ return DOUBLE; }
+{ return DEFAULT; }
        YY_BREAK
 case 121:
 YY_RULE_SETUP
 #line 218 "giscanner/scannerlexer.l"
-{ return ELSE; }
+{ return DO; }
        YY_BREAK
 case 122:
 YY_RULE_SETUP
 #line 219 "giscanner/scannerlexer.l"
-{ return ENUM; }
+{ return DOUBLE; }
        YY_BREAK
 case 123:
 YY_RULE_SETUP
 #line 220 "giscanner/scannerlexer.l"
-{ return EXTERN; }
+{ return ELSE; }
        YY_BREAK
 case 124:
 YY_RULE_SETUP
 #line 221 "giscanner/scannerlexer.l"
-{ return FLOAT; }
+{ return ENUM; }
        YY_BREAK
 case 125:
 YY_RULE_SETUP
 #line 222 "giscanner/scannerlexer.l"
-{ return FOR; }
+{ return EXTERN; }
        YY_BREAK
 case 126:
 YY_RULE_SETUP
 #line 223 "giscanner/scannerlexer.l"
-{ return GOTO; }
+{ return FLOAT; }
        YY_BREAK
 case 127:
 YY_RULE_SETUP
 #line 224 "giscanner/scannerlexer.l"
-{ return IF; }
+{ return FOR; }
        YY_BREAK
 case 128:
 YY_RULE_SETUP
 #line 225 "giscanner/scannerlexer.l"
-{ return INLINE; }
+{ return GOTO; }
        YY_BREAK
 case 129:
 YY_RULE_SETUP
 #line 226 "giscanner/scannerlexer.l"
-{ return INT; }
+{ return IF; }
        YY_BREAK
 case 130:
 YY_RULE_SETUP
 #line 227 "giscanner/scannerlexer.l"
-{ return INT; }
+{ return INLINE; }
        YY_BREAK
 case 131:
 YY_RULE_SETUP
@@ -2135,97 +2156,97 @@ YY_RULE_SETUP
 case 134:
 YY_RULE_SETUP
 #line 231 "giscanner/scannerlexer.l"
-{ return LONG; }
+{ return INT; }
        YY_BREAK
 case 135:
 YY_RULE_SETUP
 #line 232 "giscanner/scannerlexer.l"
-{ return REGISTER; }
+{ return INT; }
        YY_BREAK
 case 136:
 YY_RULE_SETUP
 #line 233 "giscanner/scannerlexer.l"
-{ return RESTRICT; }
+{ return LONG; }
        YY_BREAK
 case 137:
 YY_RULE_SETUP
 #line 234 "giscanner/scannerlexer.l"
-{ return RETURN; }
+{ return REGISTER; }
        YY_BREAK
 case 138:
 YY_RULE_SETUP
 #line 235 "giscanner/scannerlexer.l"
-{ return SHORT; }
+{ return RESTRICT; }
        YY_BREAK
 case 139:
 YY_RULE_SETUP
 #line 236 "giscanner/scannerlexer.l"
-{ return SIGNED; }
+{ return RETURN; }
        YY_BREAK
 case 140:
 YY_RULE_SETUP
 #line 237 "giscanner/scannerlexer.l"
-{ return SIZEOF; }
+{ return SHORT; }
        YY_BREAK
 case 141:
 YY_RULE_SETUP
 #line 238 "giscanner/scannerlexer.l"
-{ return STATIC; }
+{ return SIGNED; }
        YY_BREAK
 case 142:
 YY_RULE_SETUP
 #line 239 "giscanner/scannerlexer.l"
-{ return STRUCT; }
+{ return SIZEOF; }
        YY_BREAK
 case 143:
 YY_RULE_SETUP
 #line 240 "giscanner/scannerlexer.l"
-{ return SWITCH; }
+{ return STATIC; }
        YY_BREAK
 case 144:
 YY_RULE_SETUP
 #line 241 "giscanner/scannerlexer.l"
-{ return TYPEDEF; }
+{ return STRUCT; }
        YY_BREAK
 case 145:
 YY_RULE_SETUP
 #line 242 "giscanner/scannerlexer.l"
-{ return UNION; }
+{ return SWITCH; }
        YY_BREAK
 case 146:
 YY_RULE_SETUP
 #line 243 "giscanner/scannerlexer.l"
-{ return UNSIGNED; }
+{ return TYPEDEF; }
        YY_BREAK
 case 147:
 YY_RULE_SETUP
 #line 244 "giscanner/scannerlexer.l"
-{ return VOID; }
+{ return UNION; }
        YY_BREAK
 case 148:
 YY_RULE_SETUP
 #line 245 "giscanner/scannerlexer.l"
-{ return VOLATILE; }
+{ return UNSIGNED; }
        YY_BREAK
 case 149:
 YY_RULE_SETUP
 #line 246 "giscanner/scannerlexer.l"
-{ return WHILE; }
+{ return VOID; }
        YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 248 "giscanner/scannerlexer.l"
-{ return check_identifier(scanner, yytext); }
+#line 247 "giscanner/scannerlexer.l"
+{ return VOLATILE; }
        YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 250 "giscanner/scannerlexer.l"
-{ return INTEGER; }
+#line 248 "giscanner/scannerlexer.l"
+{ return WHILE; }
        YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 251 "giscanner/scannerlexer.l"
-{ return INTEGER; }
+#line 250 "giscanner/scannerlexer.l"
+{ return check_identifier(scanner, yytext); }
        YY_BREAK
 case 153:
 YY_RULE_SETUP
@@ -2234,49 +2255,59 @@ YY_RULE_SETUP
        YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 254 "giscanner/scannerlexer.l"
-{ return FLOATING; }
+#line 253 "giscanner/scannerlexer.l"
+{ return INTEGER; }
        YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 255 "giscanner/scannerlexer.l"
-{ return FLOATING; }
+#line 254 "giscanner/scannerlexer.l"
+{ return INTEGER; }
        YY_BREAK
 case 156:
-/* rule 156 can match eol */
 YY_RULE_SETUP
-#line 257 "giscanner/scannerlexer.l"
-{ return CHARACTER; }
+#line 256 "giscanner/scannerlexer.l"
+{ return FLOATING; }
        YY_BREAK
 case 157:
-/* rule 157 can match eol */
 YY_RULE_SETUP
-#line 258 "giscanner/scannerlexer.l"
-{ return CHARACTER; }
+#line 257 "giscanner/scannerlexer.l"
+{ return FLOATING; }
        YY_BREAK
 case 158:
 /* rule 158 can match eol */
 YY_RULE_SETUP
-#line 260 "giscanner/scannerlexer.l"
-{ return STRING; }
+#line 259 "giscanner/scannerlexer.l"
+{ return CHARACTER; }
        YY_BREAK
 case 159:
 /* rule 159 can match eol */
 YY_RULE_SETUP
-#line 261 "giscanner/scannerlexer.l"
-{ return STRING; }
+#line 260 "giscanner/scannerlexer.l"
+{ return CHARACTER; }
        YY_BREAK
 case 160:
+/* rule 160 can match eol */
 YY_RULE_SETUP
-#line 263 "giscanner/scannerlexer.l"
-{ print_error(scanner); }
+#line 262 "giscanner/scannerlexer.l"
+{ return STRING; }
        YY_BREAK
 case 161:
+/* rule 161 can match eol */
+YY_RULE_SETUP
+#line 263 "giscanner/scannerlexer.l"
+{ return STRING; }
+       YY_BREAK
+case 162:
 YY_RULE_SETUP
 #line 265 "giscanner/scannerlexer.l"
+{ print_error(scanner); }
+       YY_BREAK
+case 163:
+YY_RULE_SETUP
+#line 267 "giscanner/scannerlexer.l"
 ECHO;
        YY_BREAK
-#line 2280 "scannerlexer.c"
+#line 2311 "giscanner/scannerlexer.c"
                        case YY_STATE_EOF(INITIAL):
                                yyterminate();
 
@@ -2538,7 +2569,7 @@ static int yy_get_next_buffer (void)
                while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                        {
                        yy_current_state = (int) yy_def[yy_current_state];
-                       if ( yy_current_state >= 709 )
+                       if ( yy_current_state >= 732 )
                                yy_c = yy_meta[(unsigned int) yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
@@ -2561,11 +2592,11 @@ static int yy_get_next_buffer (void)
        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                {
                yy_current_state = (int) yy_def[yy_current_state];
-               if ( yy_current_state >= 709 )
+               if ( yy_current_state >= 732 )
                        yy_c = yy_meta[(unsigned int) yy_c];
                }
        yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
-       yy_is_jam = (yy_current_state == 708);
+       yy_is_jam = (yy_current_state == 731);
        if ( ! yy_is_jam )
                *(yy_state_ptr)++ = yy_current_state;
 
@@ -3214,7 +3245,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 265 "giscanner/scannerlexer.l"
+#line 267 "giscanner/scannerlexer.l"
 
 
 

diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l
index 218024e..7ffaad7 100644 (file)
--- a/giscanner/scannerlexer.l
+++ b/giscanner/scannerlexer.l
@@ -181,6 +181,8 @@ stringtext                          ([^\\\"])|(\\.)
 "__signed__"                           { return SIGNED; }
 "__restrict"                           { return RESTRICT; }
 "__restrict__"                         { return RESTRICT; }
+"thread_local"                         { return THREAD_LOCAL; }
+"_Thread_local"                                { return THREAD_LOCAL; }
 "__typeof"                             { if (!parse_ignored_macro()) REJECT; }
 "__volatile"                           { return VOLATILE; }
 "__volatile__"                         { return VOLATILE; }

diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
index 095a43f..ffcb95c 100755 (executable)
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -562,7 +562,7 @@ def scanner_main(args):
     if options.warn_fatal and warning_count > 0:
         message.fatal("warnings configured as fatal")
         return 1
-    elif warning_count > 0 and options.warn_all is False:
+    elif warning_count > 0 and options.warn_all is False and options.quiet is False:
         print("g-ir-scanner: %s: warning: %d warnings suppressed "
               "(use --warn-all to see them)" %
               (transformer.namespace.name, warning_count, ))

diff --git a/scannerparser.c b/giscanner/scannerparser.c
similarity index 60%
rename from scannerparser.c
rename to giscanner/scannerparser.c
index 1c476f7..8147f9c 100644 (file)
--- a/scannerparser.c
+++ b/giscanner/scannerparser.c
@@ -85,7 +85,6 @@ extern void ctype_free (GISourceType * type);
 
 static int last_enum_value = -1;
 static gboolean is_bitfield;
-static GHashTable *const_table = NULL;
 
 /**
  * parse_c_string_literal:
@@ -243,8 +242,31 @@ toggle_conditional (GISourceScanner *scanner)
     }
 }
 
+static void
+set_or_merge_base_type (GISourceType *type,
+                        GISourceType *base)
+{
+  if (base->type == CTYPE_INVALID)
+    {
+      g_assert (base->base_type == NULL);
+
+      type->storage_class_specifier |= base->storage_class_specifier;
+      type->type_qualifier |= base->type_qualifier;
+      type->function_specifier |= base->function_specifier;
+      type->is_bitfield |= base->is_bitfield;
+
+      ctype_free (base);
+    }
+  else
+    {
+      g_assert (type->base_type == NULL);
+
+      type->base_type = base;
+    }
+}
+
 
-#line 248 "scannerparser.c" /* yacc.c:339  */
+#line 270 "giscanner/scannerparser.c" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -264,8 +286,8 @@ toggle_conditional (GISourceScanner *scanner)
 
 /* In a future release of Bison, this section will be replaced
    by #include "y.tab.h".  */
-#ifndef YY_YY_SCANNERPARSER_H_INCLUDED
-# define YY_YY_SCANNERPARSER_H_INCLUDED
+#ifndef YY_YY_GISCANNER_SCANNERPARSER_H_INCLUDED
+# define YY_YY_GISCANNER_SCANNERPARSER_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 1
@@ -340,22 +362,23 @@ extern int yydebug;
     STATIC = 316,
     STRUCT = 317,
     SWITCH = 318,
-    TYPEDEF = 319,
-    UNION = 320,
-    UNSIGNED = 321,
-    VOID = 322,
-    VOLATILE = 323,
-    WHILE = 324,
-    FUNCTION_MACRO = 325,
-    OBJECT_MACRO = 326,
-    IFDEF_GI_SCANNER = 327,
-    IFNDEF_GI_SCANNER = 328,
-    IFDEF_COND = 329,
-    IFNDEF_COND = 330,
-    IF_COND = 331,
-    ELIF_COND = 332,
-    ELSE_COND = 333,
-    ENDIF_COND = 334
+    THREAD_LOCAL = 319,
+    TYPEDEF = 320,
+    UNION = 321,
+    UNSIGNED = 322,
+    VOID = 323,
+    VOLATILE = 324,
+    WHILE = 325,
+    FUNCTION_MACRO = 326,
+    OBJECT_MACRO = 327,
+    IFDEF_GI_SCANNER = 328,
+    IFNDEF_GI_SCANNER = 329,
+    IFDEF_COND = 330,
+    IFNDEF_COND = 331,
+    IF_COND = 332,
+    ELIF_COND = 333,
+    ELSE_COND = 334,
+    ENDIF_COND = 335
   };
 #endif
 /* Tokens.  */
@@ -420,29 +443,30 @@ extern int yydebug;
 #define STATIC 316
 #define STRUCT 317
 #define SWITCH 318
-#define TYPEDEF 319
-#define UNION 320
-#define UNSIGNED 321
-#define VOID 322
-#define VOLATILE 323
-#define WHILE 324
-#define FUNCTION_MACRO 325
-#define OBJECT_MACRO 326
-#define IFDEF_GI_SCANNER 327
-#define IFNDEF_GI_SCANNER 328
-#define IFDEF_COND 329
-#define IFNDEF_COND 330
-#define IF_COND 331
-#define ELIF_COND 332
-#define ELSE_COND 333
-#define ENDIF_COND 334
+#define THREAD_LOCAL 319
+#define TYPEDEF 320
+#define UNION 321
+#define UNSIGNED 322
+#define VOID 323
+#define VOLATILE 324
+#define WHILE 325
+#define FUNCTION_MACRO 326
+#define OBJECT_MACRO 327
+#define IFDEF_GI_SCANNER 328
+#define IFNDEF_GI_SCANNER 329
+#define IFDEF_COND 330
+#define IFNDEF_COND 331
+#define IF_COND 332
+#define ELIF_COND 333
+#define ELSE_COND 334
+#define ENDIF_COND 335
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 
 union YYSTYPE
 {
-#line 212 "giscanner/scannerparser.y" /* yacc.c:355  */
+#line 234 "giscanner/scannerparser.y" /* yacc.c:355  */
 
   char *str;
   GList *list;
@@ -453,7 +477,7 @@ union YYSTYPE
   FunctionSpecifier function_specifier;
   UnaryOperator unary_operator;
 
-#line 457 "scannerparser.c" /* yacc.c:355  */
+#line 481 "giscanner/scannerparser.c" /* yacc.c:355  */
 };
 
 typedef union YYSTYPE YYSTYPE;
@@ -466,11 +490,11 @@ extern YYSTYPE yylval;
 
 int yyparse (GISourceScanner* scanner);
 
-#endif /* !YY_YY_SCANNERPARSER_H_INCLUDED  */
+#endif /* !YY_YY_GISCANNER_SCANNERPARSER_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
-#line 474 "scannerparser.c" /* yacc.c:358  */
+#line 498 "giscanner/scannerparser.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -710,23 +734,23 @@ union yyalloc
 #endif /* !YYCOPY_NEEDED */
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  76
+#define YYFINAL  77
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2799
+#define YYLAST   2610
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  104
+#define YYNTOKENS  105
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  77
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  256
+#define YYNRULES  257
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  426
+#define YYNSTATES  427
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   334
+#define YYMAXUTOK   335
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -738,16 +762,16 @@ static const yytype_uint8 yytranslate[] =
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    93,     2,     2,     2,    95,    88,     2,
-      80,    81,    89,    90,    87,    91,    86,    94,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   101,   103,
-      96,   102,    97,   100,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    94,     2,     2,     2,    96,    89,     2,
+      81,    82,    90,    91,    88,    92,    87,    95,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   102,   104,
+      97,   103,    98,   101,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,    84,     2,    85,    98,     2,     2,     2,     2,     2,
+       2,    85,     2,    86,    99,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    82,    99,    83,    92,     2,     2,     2,
+       2,     2,     2,    83,   100,    84,    93,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -768,39 +792,39 @@ static const yytype_uint8 yytranslate[] =
       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
       55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79
+      75,    76,    77,    78,    79,    80
 };
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   304,   304,   313,   329,   335,   341,   348,   349,   353,
-     361,   376,   390,   397,   398,   402,   403,   407,   411,   415,
-     419,   423,   427,   434,   435,   439,   440,   444,   448,   471,
-     478,   485,   489,   497,   501,   505,   509,   513,   517,   524,
-     525,   537,   538,   544,   552,   563,   564,   570,   579,   580,
-     592,   601,   602,   608,   614,   620,   629,   630,   636,   645,
-     646,   655,   656,   665,   666,   675,   676,   687,   688,   699,
-     700,   707,   708,   715,   716,   717,   718,   719,   720,   721,
-     722,   723,   724,   725,   729,   730,   731,   738,   744,   762,
-     769,   774,   779,   792,   793,   798,   803,   808,   816,   820,
-     827,   828,   832,   836,   840,   844,   848,   855,   859,   863,
-     867,   871,   875,   879,   883,   887,   891,   895,   896,   897,
-     905,   925,   930,   938,   943,   951,   952,   959,   979,   984,
-     985,   990,   998,  1002,  1010,  1013,  1014,  1018,  1029,  1036,
-    1043,  1050,  1057,  1064,  1073,  1073,  1082,  1090,  1098,  1110,
-    1114,  1118,  1122,  1129,  1136,  1141,  1145,  1150,  1154,  1159,
-    1164,  1174,  1181,  1190,  1195,  1199,  1210,  1223,  1224,  1231,
-    1235,  1242,  1247,  1252,  1257,  1264,  1270,  1279,  1280,  1284,
-    1289,  1290,  1298,  1302,  1307,  1312,  1317,  1322,  1328,  1338,
-    1344,  1357,  1364,  1365,  1366,  1370,  1371,  1377,  1378,  1379,
-    1380,  1381,  1382,  1386,  1387,  1388,  1392,  1393,  1397,  1398,
-    1402,  1403,  1407,  1408,  1412,  1413,  1414,  1418,  1419,  1420,
-    1421,  1422,  1423,  1424,  1425,  1426,  1427,  1431,  1432,  1433,
-    1434,  1435,  1441,  1442,  1446,  1447,  1448,  1452,  1453,  1457,
-    1458,  1464,  1471,  1478,  1482,  1493,  1498,  1503,  1508,  1513,
-    1518,  1525,  1530,  1538,  1539,  1540,  1541
+       0,   326,   326,   335,   351,   357,   363,   370,   371,   375,
+     383,   398,   412,   419,   420,   424,   425,   429,   433,   437,
+     441,   445,   449,   456,   457,   461,   462,   466,   470,   493,
+     500,   507,   511,   519,   523,   527,   531,   535,   539,   546,
+     547,   559,   560,   566,   574,   585,   586,   592,   601,   602,
+     614,   623,   624,   630,   636,   642,   651,   652,   658,   667,
+     668,   677,   678,   687,   688,   697,   698,   709,   710,   721,
+     722,   729,   730,   737,   738,   739,   740,   741,   742,   743,
+     744,   745,   746,   747,   751,   752,   753,   760,   766,   784,
+     791,   796,   801,   814,   815,   820,   825,   830,   838,   842,
+     849,   850,   854,   858,   862,   866,   870,   874,   881,   885,
+     889,   893,   897,   901,   905,   909,   913,   917,   921,   922,
+     923,   931,   951,   956,   964,   969,   977,   978,   985,  1005,
+    1010,  1011,  1016,  1024,  1028,  1036,  1039,  1040,  1044,  1055,
+    1062,  1069,  1076,  1083,  1090,  1099,  1099,  1108,  1116,  1124,
+    1136,  1140,  1144,  1148,  1155,  1162,  1167,  1171,  1176,  1180,
+    1185,  1190,  1200,  1207,  1216,  1221,  1225,  1236,  1249,  1250,
+    1257,  1261,  1268,  1273,  1278,  1283,  1290,  1296,  1305,  1306,
+    1310,  1315,  1316,  1324,  1328,  1333,  1338,  1343,  1348,  1354,
+    1364,  1370,  1383,  1390,  1391,  1392,  1396,  1397,  1403,  1404,
+    1405,  1406,  1407,  1408,  1412,  1413,  1414,  1418,  1419,  1423,
+    1424,  1428,  1429,  1433,  1434,  1438,  1439,  1440,  1444,  1445,
+    1446,  1447,  1448,  1449,  1450,  1451,  1452,  1453,  1457,  1458,
+    1459,  1460,  1461,  1467,  1468,  1472,  1473,  1474,  1478,  1479,
+    1483,  1484,  1490,  1497,  1504,  1508,  1525,  1530,  1535,  1540,
+    1545,  1550,  1557,  1562,  1570,  1571,  1572,  1573
 };
 #endif
 
@@ -817,14 +841,15 @@ static const char *const yytname[] =
   "AUTO", "BOOL", "BREAK", "CASE", "CHAR", "CONST", "CONTINUE", "DEFAULT",
   "DO", "DOUBLE", "ELSE", "ENUM", "EXTENSION", "EXTERN", "FLOAT", "FOR",
   "GOTO", "IF", "INLINE", "INT", "LONG", "REGISTER", "RESTRICT", "RETURN",
-  "SHORT", "SIGNED", "SIZEOF", "STATIC", "STRUCT", "SWITCH", "TYPEDEF",
-  "UNION", "UNSIGNED", "VOID", "VOLATILE", "WHILE", "FUNCTION_MACRO",
-  "OBJECT_MACRO", "IFDEF_GI_SCANNER", "IFNDEF_GI_SCANNER", "IFDEF_COND",
-  "IFNDEF_COND", "IF_COND", "ELIF_COND", "ELSE_COND", "ENDIF_COND", "'('",
-  "')'", "'{'", "'}'", "'['", "']'", "'.'", "','", "'&'", "'*'", "'+'",
-  "'-'", "'~'", "'!'", "'/'", "'%'", "'<'", "'>'", "'^'", "'|'", "'?'",
-  "':'", "'='", "';'", "$accept", "primary_expression", "strings",
-  "identifier", "identifier_or_typedef_name", "postfix_expression",
+  "SHORT", "SIGNED", "SIZEOF", "STATIC", "STRUCT", "SWITCH",
+  "THREAD_LOCAL", "TYPEDEF", "UNION", "UNSIGNED", "VOID", "VOLATILE",
+  "WHILE", "FUNCTION_MACRO", "OBJECT_MACRO", "IFDEF_GI_SCANNER",
+  "IFNDEF_GI_SCANNER", "IFDEF_COND", "IFNDEF_COND", "IF_COND", "ELIF_COND",
+  "ELSE_COND", "ENDIF_COND", "'('", "')'", "'{'", "'}'", "'['", "']'",
+  "'.'", "','", "'&'", "'*'", "'+'", "'-'", "'~'", "'!'", "'/'", "'%'",
+  "'<'", "'>'", "'^'", "'|'", "'?'", "':'", "'='", "';'", "$accept",
+  "primary_expression", "strings", "identifier",
+  "identifier_or_typedef_name", "postfix_expression",
   "argument_expression_list", "unary_expression", "unary_operator",
   "cast_expression", "multiplicative_expression", "additive_expression",
   "shift_expression", "relational_expression", "equality_expression",
@@ -864,16 +889,16 @@ static const yytype_uint16 yytoknum[] =
      305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
      315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
      325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-      40,    41,   123,   125,    91,    93,    46,    44,    38,    42,
-      43,    45,   126,    33,    47,    37,    60,    62,    94,   124,
-      63,    58,    61,    59
+     335,    40,    41,   123,   125,    91,    93,    46,    44,    38,
+      42,    43,    45,   126,    33,    47,    37,    60,    62,    94,
+     124,    63,    58,    61,    59
 };
 # endif
 
-#define YYPACT_NINF -234
+#define YYPACT_NINF -237
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-234)))
+  (!!((Yystate) == (-237)))
 
 #define YYTABLE_NINF -15
 
@@ -884,49 +909,49 @@ static const yytype_uint16 yytoknum[] =
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    2506,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234,    33,  2731,  2731,
-    -234,    39,  -234,    46,  2731,  2731,  -234,  2373,  -234,  -234,
-     -63,  1962,  -234,  -234,  -234,  -234,  -234,    35,   120,  -234,
-    -234,   -48,  -234,  1134,   -20,    15,  -234,  -234,  1083,  -234,
-     -55,  -234,  -234,   -45,  -234,  -234,  -234,  -234,    31,  -234,
-    -234,  -234,  -234,  -234,    10,    34,  2025,  2025,    40,  2088,
-    1266,  -234,  -234,  -234,  -234,  -234,  -234,  -234,    56,  -234,
-     184,  -234,  1962,  -234,    80,   213,   279,    41,   282,    44,
-      59,    69,   114,     3,  -234,  -234,    98,  -234,  -234,   120,
-      35,  -234,   468,  1395,  -234,    33,  -234,  2620,  2583,  1458,
-     -20,  1083,  2419,  -234,    45,  1083,  1083,    -1,    31,  -234,
-    -234,    90,  2025,  2025,  2151,  -234,  -234,   110,  1266,  -234,
-    2214,   571,  -234,  -234,   100,   109,   122,  -234,  -234,  -234,
-     311,  1521,  2151,   311,  -234,  1962,  1962,  1962,  1962,  1962,
-    1962,  1962,  1962,  1962,  1962,  1962,  1962,  1962,  1962,  1962,
-    1962,  1962,  1962,  2151,  -234,  -234,  -234,  -234,   112,   153,
-    1962,   156,   140,   819,   191,   311,   194,   884,   208,   211,
-    -234,  -234,   193,   204,   -40,  -234,   218,  -234,  -234,  -234,
-     569,  -234,  -234,  -234,  -234,  -234,  1395,  -234,  -234,  -234,
-    -234,  -234,  -234,    64,   123,  -234,   125,  -234,   238,  -234,
-    -234,  -234,  1962,   -29,  -234,   225,  -234,  2455,  -234,    16,
-     228,  -234,   107,  -234,    31,   215,   250,  2214,   751,   253,
-    1200,   249,  -234,  -234,  -234,  -234,  -234,  -234,  -234,  -234,
-    -234,  -234,  -234,  1962,  -234,  1962,  2333,  1584,   121,  -234,
-     199,  1962,  -234,  -234,   157,  -234,    22,  -234,  -234,  -234,
-    -234,    80,    80,   213,   213,   279,   279,   279,   279,    41,
-      41,   282,    44,    59,    69,   114,    30,  -234,   236,  -234,
-     819,   269,   947,   237,  2151,  -234,   -28,  2151,  2151,   819,
-    -234,  -234,  -234,  -234,   210,  2274,  -234,    12,  -234,  -234,
-    2695,  -234,  -234,  -234,    45,  -234,  1962,  -234,  -234,  -234,
-    1962,  -234,    23,  -234,  -234,  -234,   660,  -234,  -234,  -234,
-    -234,   159,   258,  -234,   256,   199,  2658,  1647,  -234,  -234,
-    1962,  -234,  2151,   819,  -234,   264,  1010,   -25,  -234,   161,
-    -234,   164,   168,  -234,  -234,  1332,  -234,  -234,  -234,  -234,
-    -234,   265,  -234,  -234,  -234,  -234,   179,  -234,   260,  -234,
-     249,  -234,  2151,  1710,    58,  1073,   819,   819,   819,  -234,
-    -234,  -234,  -234,  -234,   180,   819,   188,  1773,  1836,    77,
-     310,  -234,  -234,   252,  -234,   819,   819,   195,   819,   203,
-    1899,   819,  -234,  -234,  -234,   819,  -234,   819,   819,   205,
-    -234,  -234,  -234,  -234,   819,  -234
+    2256,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,
+    -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,
+    -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,
+    -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,    39,  2505,
+    2505,  -237,    23,  -237,    61,  2505,  2505,  -237,  2133,  -237,
+    -237,   -47,  1783,  -237,  -237,  -237,  -237,  -237,    34,   125,
+    -237,  -237,   -45,  -237,  1092,    87,    33,  -237,  -237,  2541,
+    -237,   -35,  -237,  -237,   -29,  -237,  -237,  -237,  -237,    66,
+    -237,  -237,  -237,  -237,  -237,   -36,    14,  1825,  1825,    36,
+    1881,  1226,  -237,  -237,  -237,  -237,  -237,  -237,  -237,   116,
+    -237,   157,  -237,  1783,  -237,    84,   216,   154,    11,   278,
+       4,    67,    35,   130,   -11,  -237,  -237,   122,  -237,  -237,
+     125,    34,  -237,   471,  1335,  -237,    39,  -237,  2372,  2334,
+    1391,    87,  2541,  2179,  -237,    32,  2541,  2541,   -10,    66,
+    -237,  -237,    69,  1825,  1825,  1923,  -237,  -237,   131,  1226,
+    -237,  1979,   565,  -237,  -237,   105,   120,   159,  -237,  -237,
+    -237,   213,  1433,  1923,   213,  -237,  1783,  1783,  1783,  1783,
+    1783,  1783,  1783,  1783,  1783,  1783,  1783,  1783,  1783,  1783,
+    1783,  1783,  1783,  1783,  1923,  -237,  -237,  -237,  -237,   145,
+     152,  1783,   155,   166,   816,   190,   213,   205,   882,   210,
+     234,  -237,  -237,   181,   192,   -44,  -237,   219,  -237,  -237,
+    -237,   563,  -237,  -237,  -237,  -237,  -237,  1335,  -237,  -237,
+    -237,  -237,  -237,  -237,    47,   110,  -237,   121,  -237,   243,
+    -237,  -237,  -237,  1783,   -20,  -237,   228,  -237,  2216,  -237,
+      12,   231,  -237,   204,  -237,    66,   249,   254,  1979,   747,
+     255,  1159,   250,  -237,  -237,  -237,  -237,  -237,  -237,  -237,
+    -237,  -237,  -237,  -237,  1783,  -237,  1783,  2063,  1489,   212,
+    -237,   215,  1783,  -237,  -237,   124,  -237,    60,  -237,  -237,
+    -237,  -237,    84,    84,   216,   216,   154,   154,   154,   154,
+      11,    11,   278,     4,    67,    35,   130,   -39,  -237,   237,
+    -237,   816,   270,   924,   241,  1923,  -237,   -18,  1923,  1923,
+     816,  -237,  -237,  -237,  -237,   217,  1997,  -237,    22,  -237,
+    -237,  2469,  -237,  -237,  -237,    32,  -237,  1783,  -237,  -237,
+    -237,  1783,  -237,    15,  -237,  -237,  -237,   655,  -237,  -237,
+    -237,  -237,   158,   259,  -237,   260,   215,  2431,  1531,  -237,
+    -237,  1783,  -237,  1923,   816,  -237,   272,   988,   -17,  -237,
+     163,  -237,   167,   178,  -237,  -237,  1293,  -237,  -237,  -237,
+    -237,  -237,   273,  -237,  -237,  -237,  -237,   179,  -237,   271,
+    -237,   250,  -237,  1923,  1587,    57,  1030,   816,   816,   816,
+    -237,  -237,  -237,  -237,  -237,   182,   816,   187,  1629,  1685,
+      65,   312,  -237,  -237,   257,  -237,   816,   816,   191,   816,
+     194,  1727,   816,  -237,  -237,  -237,   816,  -237,   816,   816,
+     202,  -237,  -237,  -237,  -237,   816,  -237
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -934,75 +959,75 @@ static const yytype_int16 yypact[] =
      means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       0,   256,   191,   105,   116,   108,   149,   113,   143,   151,
-     103,   112,   153,   110,   111,   106,   150,   109,   114,   104,
-     123,   102,   124,   115,   107,   152,   241,   242,   245,   246,
-     247,   248,   249,   250,   251,   252,   235,     0,    91,    93,
-     117,     0,   118,     0,    95,    97,   119,     0,   232,   234,
-       0,     0,   253,   254,   255,   236,    12,     0,   164,    89,
-     156,     0,    98,   100,   155,     0,    90,    92,     0,    13,
-     122,    14,   144,   142,    94,    96,     1,   233,     0,     3,
-       6,     4,     5,    10,     0,     0,     0,     0,     0,     0,
-       0,    33,    34,    35,    36,    37,    38,    15,     7,     2,
-      25,    39,     0,    41,    45,    48,    51,    56,    59,    61,
-      63,    65,    67,    69,    87,   244,     0,   167,   166,   163,
-       0,    88,     0,     0,   239,     0,   238,     0,     0,     0,
-     154,   129,     0,   125,   134,   131,     0,     0,     0,   144,
-     175,     0,     0,     0,     0,    26,    27,     0,     0,    31,
-     151,    39,    71,    84,     0,   177,     0,    11,    21,    22,
-       0,     0,     0,     0,    28,     0,     0,     0,     0,     0,
+       0,   257,   192,   105,   117,   109,   150,   114,   144,   152,
+     103,   113,   154,   111,   112,   106,   151,   110,   115,   104,
+     124,   107,   102,   125,   116,   108,   153,   242,   243,   246,
+     247,   248,   249,   250,   251,   252,   253,   236,     0,    91,
+      93,   118,     0,   119,     0,    95,    97,   120,     0,   233,
+     235,     0,     0,   254,   255,   256,   237,    12,     0,   165,
+      89,   157,     0,    98,   100,   156,     0,    90,    92,     0,
+      13,   123,    14,   145,   143,    94,    96,     1,   234,     0,
+       3,     6,     4,     5,    10,     0,     0,     0,     0,     0,
+       0,     0,    33,    34,    35,    36,    37,    38,    15,     7,
+       2,    25,    39,     0,    41,    45,    48,    51,    56,    59,
+      61,    63,    65,    67,    69,    87,   245,     0,   168,   167,
+     164,     0,    88,     0,     0,   240,     0,   239,     0,     0,
+       0,   155,   130,     0,   126,   135,   132,     0,     0,     0,
+     145,   176,     0,     0,     0,     0,    26,    27,     0,     0,
+      31,   152,    39,    71,    84,     0,   178,     0,    11,    21,
+      22,     0,     0,     0,     0,    28,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   157,   168,   165,    99,   100,     0,
+       0,     0,     0,     0,     0,   158,   169,   166,    99,   100,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     206,   212,     2,     0,     0,   210,   119,   211,   197,   198,
-       0,   208,   199,   200,   201,   202,     0,   192,   101,   240,
-     237,   174,   162,   173,     0,   169,     0,   159,     0,   128,
-     121,   126,     0,     0,   132,   135,   130,     0,   139,     0,
-     147,   145,     0,   243,     0,     0,     0,     0,     0,     0,
-       0,    86,    77,    78,    74,    75,    76,    82,    81,    83,
-      79,    80,    73,     0,     8,     0,     0,     0,   179,   178,
-     180,     0,    20,    18,     0,    23,     0,    19,    42,    43,
-      44,    46,    47,    49,    50,    54,    55,    52,    53,    57,
-      58,    60,    62,    64,    66,    68,     0,   229,     0,   228,
-       0,     0,     0,     0,     0,   230,     0,     0,     0,     0,
-     213,   207,   209,   195,     0,     0,   171,   179,   172,   160,
-       0,   161,   158,   136,   134,   127,     0,   120,   141,   146,
-       0,   138,     0,   176,    29,    30,     0,    32,    72,    85,
-     187,     0,     0,   183,     0,   181,     0,     0,    40,    17,
-       0,    16,     0,     0,   205,     0,     0,     0,   227,     0,
-     231,     0,     0,   203,   193,     0,   170,   133,   137,   148,
-     140,     0,   188,   182,   184,   189,     0,   185,     0,    24,
-      70,   204,     0,     0,     0,     0,     0,     0,     0,   194,
-     196,     9,   190,   186,     0,     0,     0,     0,     0,     0,
-     214,   216,   217,     0,   219,     0,     0,     0,     0,     0,
-       0,     0,   218,   223,   221,     0,   220,     0,     0,     0,
-     215,   225,   224,   222,     0,   226
+       0,   207,   213,     2,     0,     0,   211,   120,   212,   198,
+     199,     0,   209,   200,   201,   202,   203,     0,   193,   101,
+     241,   238,   175,   163,   174,     0,   170,     0,   160,     0,
+     129,   122,   127,     0,     0,   133,   136,   131,     0,   140,
+       0,   148,   146,     0,   244,     0,     0,     0,     0,     0,
+       0,     0,    86,    77,    78,    74,    75,    76,    82,    81,
+      83,    79,    80,    73,     0,     8,     0,     0,     0,   180,
+     179,   181,     0,    20,    18,     0,    23,     0,    19,    42,
+      43,    44,    46,    47,    49,    50,    54,    55,    52,    53,
+      57,    58,    60,    62,    64,    66,    68,     0,   230,     0,
+     229,     0,     0,     0,     0,     0,   231,     0,     0,     0,
+       0,   214,   208,   210,   196,     0,     0,   172,   180,   173,
+     161,     0,   162,   159,   137,   135,   128,     0,   121,   142,
+     147,     0,   139,     0,   177,    29,    30,     0,    32,    72,
+      85,   188,     0,     0,   184,     0,   182,     0,     0,    40,
+      17,     0,    16,     0,     0,   206,     0,     0,     0,   228,
+       0,   232,     0,     0,   204,   194,     0,   171,   134,   138,
+     149,   141,     0,   189,   183,   185,   190,     0,   186,     0,
+      24,    70,   205,     0,     0,     0,     0,     0,     0,     0,
+     195,   197,     9,   191,   187,     0,     0,     0,     0,     0,
+       0,   215,   217,   218,     0,   220,     0,     0,     0,     0,
+       0,     0,     0,   219,   224,   222,     0,   221,     0,     0,
+       0,   216,   226,   225,   223,     0,   227
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -234,  -234,  -234,   -37,   -33,  -234,  -234,    53,  -234,   -86,
-     149,   150,   138,   152,   178,   182,   177,   181,   183,  -234,
-     -49,  -100,  -234,   -50,  -176,    24,     7,  -234,   239,  -234,
-     -59,  -234,  -234,   227,  -119,   -78,  -234,    42,  -234,  -234,
-     231,  -234,   226,   333,  -234,   -15,   -64,   -53,  -234,  -107,
-      47,   244,   234,  -130,  -233,   -11,  -205,  -234,    43,  -234,
-     -19,   137,  -207,  -234,  -234,  -234,  -234,  -234,   326,  -234,
-    -234,  -234,  -234,  -234,  -234,  -234,  -234
+    -237,  -237,  -237,   -38,   -34,  -237,  -237,    52,  -237,   -87,
+     141,   142,   144,   149,   180,   183,   184,   185,   189,  -237,
+     -50,  -101,  -237,   -51,  -177,     3,     7,  -237,   245,  -237,
+     -60,  -237,  -237,   225,  -120,   -74,  -237,    45,  -237,  -237,
+     224,  -237,   252,   253,  -237,   -16,   -65,   -54,  -237,  -108,
+      71,   264,   233,  -132,  -236,   -12,  -206,  -237,    42,  -237,
+      -7,   139,  -199,  -237,  -237,  -237,  -237,  -237,   350,  -237,
+    -237,  -237,  -237,  -237,  -237,  -237,  -237
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,    97,    98,    99,   203,   100,   274,   151,   102,   103,
-     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     152,   153,   263,   204,   115,   205,   125,    61,    62,    38,
-      39,    40,    41,   132,   133,   134,   233,   234,    42,    43,
-     137,   138,   329,    44,    45,   116,    64,    65,   119,   341,
-     225,   141,   156,   342,   270,    46,   218,   314,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,    47,    48,    49,
-     127,    50,    51,    52,    53,    54,    55
+      -1,    98,    99,   100,   204,   101,   275,   152,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     153,   154,   264,   205,   116,   206,   126,    62,    63,    39,
+      40,    41,    42,   133,   134,   135,   234,   235,    43,    44,
+     138,   139,   330,    45,    46,   117,    65,    66,   120,   342,
+     226,   142,   157,   343,   271,    47,   219,   315,   208,   209,
+     210,   211,   212,   213,   214,   215,   216,    48,    49,    50,
+     128,    51,    52,    53,    54,    55,    56
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1010,570 +1035,534 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-      60,   130,   114,   312,    69,   118,    69,    37,    70,   131,
-      73,   313,   155,   231,   298,    56,   164,    78,    56,    56,
-      60,   224,    63,   217,    36,   269,    56,   136,    60,   228,
-      71,   131,    71,   182,    56,   345,    56,   139,    56,   120,
-     154,   140,    56,     2,   126,    66,    67,   265,    56,    56,
-       2,    74,    75,   229,    37,   121,   323,   236,   324,   265,
-     128,   275,   265,   310,   129,   157,   186,    56,   172,   173,
-     155,    36,   131,   131,   325,   360,   131,   131,   385,   278,
-     279,   280,   238,    60,   345,   202,   239,   124,    60,   131,
-     142,   140,   315,   318,   154,    57,   267,    60,   154,   328,
-     251,   240,   268,   183,   101,   188,   370,   351,   220,   265,
-     188,   206,   276,    57,   143,    57,   217,   265,   231,   235,
-     147,    68,    58,    69,    58,    57,    69,   272,    72,   312,
-     277,   352,   178,   296,    58,   223,    59,   174,   175,   145,
-     146,   114,   149,   181,   315,   265,   232,   306,   267,    71,
-     368,   219,    71,    58,   369,   101,   202,   179,    69,     6,
-     390,   397,   303,   338,   265,   339,     9,   344,   180,   165,
-     317,   243,   155,   202,   166,   167,    16,   244,   131,   184,
-     410,   264,    71,   114,    71,   348,    60,   265,    25,   266,
-     331,   131,   248,   267,   332,   245,   246,   251,    58,   206,
-     154,   266,   240,   271,   319,   267,   321,   333,   316,    58,
-     320,   202,   244,   268,   123,   158,   159,   160,   101,   101,
-     101,   101,   101,   101,   101,   101,   101,   101,   101,   101,
-     101,   101,   101,   101,   101,   101,   301,   206,   349,   376,
-     372,   300,   386,   101,   350,   387,   320,   378,   265,   388,
-     379,   265,   357,   130,   359,   265,   297,   361,   362,   299,
-     392,   403,   317,   202,   161,   217,   320,   265,   162,   405,
-     163,   302,   202,   223,   304,   265,   415,   114,    60,   346,
-      60,   114,   265,   347,   417,   101,   424,    60,   307,    71,
-     265,   308,   265,   364,   -13,   240,   334,   365,    71,   202,
-     170,   171,   380,   168,   169,   309,   384,   176,   177,   235,
-     285,   286,   287,   288,    56,     2,   202,   281,   282,   -14,
-     283,   284,   223,   322,   101,   206,   326,   223,   289,   290,
-     330,   335,   394,   396,   337,   399,   265,   353,   355,   373,
-     358,   374,    71,   354,   382,   393,   391,   407,   409,   202,
-     202,   202,   363,   223,   411,   412,   291,   293,   202,   187,
-     419,   292,   294,   237,   241,   295,   367,   366,   202,   202,
-     242,   202,   226,    77,   202,    71,    71,    71,   202,   101,
-     202,   202,   249,   101,    71,   336,     0,   202,     0,     0,
-       0,   117,     0,     0,    71,    71,   381,    71,     0,     0,
-      71,   135,     0,     0,    71,     0,    71,    71,     0,     0,
-       0,     0,     0,    71,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   135,     0,     0,     0,     0,     0,   400,
-     401,   402,     0,     0,     0,     0,     0,     0,   404,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   413,   414,
-       0,   416,   185,     0,   420,     0,     0,     0,   421,     0,
-     422,   423,     0,     0,   135,   135,     0,   425,   135,   135,
-       0,    56,     2,    79,    80,    81,    82,    83,    84,    85,
-       0,   135,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    86,
-      87,     0,     3,     4,   189,   190,     5,     6,   191,   192,
-     193,     7,     0,     8,   150,    10,    11,   194,   195,   196,
-      12,    13,    14,    15,    16,   197,    17,    18,    89,    19,
-      20,   198,    21,    22,    23,    24,    25,   199,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    90,     0,
-     122,   200,     0,     0,     0,     0,    91,    92,    93,    94,
-      95,    96,     0,     0,     0,     0,     0,     0,     0,     0,
-     135,   201,    56,     2,    79,    80,    81,    82,    83,    84,
-      85,     0,     0,   135,   252,   253,   254,   255,   256,   257,
-     258,   259,     0,     0,   260,   261,     0,     0,     0,     0,
-      86,    87,     0,     3,     4,   189,   190,     5,     6,   191,
-     192,   193,     7,     0,     8,   150,    10,    11,   194,   195,
-     196,    12,    13,    14,    15,    16,   197,    17,    18,    89,
-      19,    20,   198,    21,    22,    23,    24,    25,   199,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    90,
-       0,   122,   311,     0,     0,     0,     0,    91,    92,    93,
-      94,    95,    96,    56,     2,    79,    80,    81,    82,    83,
-      84,    85,   201,   262,     0,     0,     0,     0,     0,     0,
+      61,   131,   115,    37,    70,   119,    70,    38,    71,   132,
+      74,   314,   313,   232,   299,    57,   165,   156,    57,   183,
+      61,   225,    64,   218,   270,    57,    57,     2,    61,   229,
+      72,   132,    72,   346,    79,    57,    57,    57,   173,   174,
+     155,   141,    57,   121,   266,   143,    67,    68,   137,   266,
+      57,    37,    75,    76,   140,    38,   324,   127,   230,   122,
+     311,   276,   237,   353,    57,     2,   187,   125,   325,    57,
+     266,   266,   132,   132,   239,   156,   132,   132,   240,   279,
+     280,   281,   346,    61,   326,   203,   361,   386,    61,   132,
+     184,   141,   319,   179,   155,   144,   329,    61,   155,   371,
+     252,   241,   269,   316,   102,   189,    69,   268,   175,   176,
+     189,   207,   277,    58,    58,    58,   218,   148,   232,   236,
+      58,   221,    59,    70,    59,   158,    70,   273,   316,    59,
+     278,   220,   268,   297,   233,   181,   224,    59,   313,   146,
+     147,   115,   150,    60,    73,   266,   352,   307,   266,    72,
+     369,   244,    72,   266,   370,   102,   203,   245,    70,   182,
+     391,   398,   304,   339,     6,   340,   180,   345,   129,   411,
+     318,     9,   130,   203,   166,   171,   172,   156,   132,   167,
+     168,    16,    72,   115,    72,   349,    61,   265,   159,   160,
+     161,   132,   320,   266,    26,   246,   247,   252,   321,   207,
+     155,   267,   241,   322,   185,   268,   350,   334,   317,   245,
+      59,   203,   351,   269,   249,    59,    57,     2,   102,   102,
+     102,   102,   102,   102,   102,   102,   102,   102,   102,   102,
+     102,   102,   102,   102,   102,   102,   302,   207,   162,   377,
+     373,   272,   163,   102,   164,   387,   321,   379,   124,   388,
+     380,   266,   358,   131,   360,   266,   298,   362,   363,   300,
+     389,   393,   318,   203,   404,   218,   266,   321,   301,   406,
+     266,   303,   203,   416,   224,   266,   418,   115,    61,   266,
+      61,   115,   266,   -13,   425,   102,   305,    61,   332,    72,
+     266,   308,   333,   267,   310,   241,   347,   268,    72,   203,
+     348,   365,   381,   177,   178,   366,   385,   169,   170,   236,
+     282,   283,   118,   284,   285,   309,   203,   286,   287,   288,
+     289,   -14,   136,   224,   102,   207,   290,   291,   224,   323,
+     327,   335,   395,   397,   331,   400,   336,   338,   266,   354,
+     356,   374,    72,   355,   136,   359,   375,   408,   410,   203,
+     203,   203,   364,   383,   224,   392,   412,   394,   203,   292,
+     420,   413,   238,   293,   243,   294,   188,   295,   203,   203,
+     368,   203,   296,   186,   203,    72,    72,    72,   203,   102,
+     203,   203,   250,   102,    72,   136,   136,   203,   337,   136,
+     136,   242,   367,   227,    72,    72,   382,    72,    78,     0,
+      72,     0,   136,     0,    72,     0,    72,    72,     0,     0,
+       0,     0,     0,    72,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   401,
+     402,   403,     0,     0,     0,     0,     0,     0,   405,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   414,   415,
+       0,   417,     0,     0,   421,     0,     0,     0,   422,     0,
+     423,   424,     0,     0,     0,     0,     0,   426,     0,     0,
+       0,     0,     0,     0,    57,     2,    80,    81,    82,    83,
+      84,    85,    86,     0,     0,     0,     0,     0,     0,     0,
+       0,   136,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    87,    88,   136,     3,     4,   190,   191,     5,
+       6,   192,   193,   194,     7,     0,     8,   151,    10,    11,
+     195,   196,   197,    12,    13,    14,    15,    16,   198,    17,
+      18,    90,    19,    20,   199,    21,    22,    23,    24,    25,
+      26,   200,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    91,     0,   123,   201,     0,     0,     0,     0,
+      92,    93,    94,    95,    96,    97,    57,     2,    80,    81,
+      82,    83,    84,    85,    86,   202,     0,     0,   253,   254,
+     255,   256,   257,   258,   259,   260,     0,     0,   261,   262,
+       0,     0,     0,     0,    87,    88,     0,     3,     4,   190,
+     191,     5,     6,   192,   193,   194,     7,     0,     8,   151,
+      10,    11,   195,   196,   197,    12,    13,    14,    15,    16,
+     198,    17,    18,    90,    19,    20,   199,    21,    22,    23,
+      24,    25,    26,   200,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    91,     0,   123,   312,     0,     0,
+       0,     0,    92,    93,    94,    95,    96,    97,    57,     2,
+      80,    81,    82,    83,    84,    85,    86,   202,   263,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    86,    87,     0,     3,     4,   189,   190,     5,     6,
-     191,   192,   193,     7,     0,     8,   150,    10,    11,   194,
-     195,   196,    12,    13,    14,    15,    16,   197,    17,    18,
-      89,    19,    20,   198,    21,    22,    23,    24,    25,   199,
+       0,     0,     0,     0,     0,     0,    87,    88,     0,     3,
+       4,   190,   191,     5,     6,   192,   193,   194,     7,     0,
+       8,   151,    10,    11,   195,   196,   197,    12,    13,    14,
+      15,    16,   198,    17,    18,    90,    19,    20,   199,    21,
+      22,    23,    24,    25,    26,   200,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    91,     0,   123,   372,
+       0,     0,     0,     0,    92,    93,    94,    95,    96,    97,
+      57,     2,    80,    81,    82,    83,    84,    85,    86,   202,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      90,     0,   122,   371,     0,     0,     0,     0,    91,    92,
-      93,    94,    95,    96,    56,     2,    79,    80,    81,    82,
-      83,    84,    85,   201,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    87,    88,
+       0,     3,     4,   190,   191,     5,     6,   192,   193,   194,
+       7,     0,     8,   151,    10,    11,   195,   196,   197,    12,
+      13,    14,    15,    16,   198,    17,    18,    90,    19,    20,
+     199,    21,    22,    23,    24,    25,    26,   200,     0,    57,
+       2,    80,    81,    82,    83,    84,    85,    86,    91,     0,
+     123,     0,     0,     0,     0,     0,    92,    93,    94,    95,
+      96,    97,     0,     0,     0,     0,     0,    87,    88,     0,
+       0,   202,   190,   191,     0,     0,   192,   193,   194,     0,
+       0,     0,   248,     0,     0,   195,   196,   197,     0,     0,
+       0,     0,     0,   198,     0,     0,    90,     0,     0,   199,
+       0,     0,     0,     0,     0,    57,   200,    80,    81,    82,
+      83,    84,    85,    86,     0,     0,     0,    91,     0,   123,
+       0,     0,     0,     0,     0,    92,    93,    94,    95,    96,
+      97,     0,     0,    87,    88,     0,     0,     0,     0,     0,
+     202,     0,     0,     0,     0,     0,     0,    57,   248,    80,
+      81,    82,    83,    84,    85,    86,     0,     0,     0,     0,
+       0,     0,    90,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    87,    88,     0,     0,     0,
+       0,     0,     0,    91,     0,     0,     0,     0,     0,     0,
+     248,    92,    93,    94,    95,    96,    97,     0,     0,     0,
+       0,     0,     0,     0,    90,     0,   306,     0,     0,     0,
+       0,    57,     0,    80,    81,    82,    83,    84,    85,    86,
+       0,     0,     0,     0,     0,    91,     0,     0,     0,     0,
+       0,     0,     0,    92,    93,    94,    95,    96,    97,    87,
+      88,     0,     0,     0,     0,     0,     0,     0,   357,     0,
+       0,     0,     0,    57,   248,    80,    81,    82,    83,    84,
+      85,    86,     0,     0,     0,     0,     0,     0,    90,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    86,    87,     0,     3,     4,   189,   190,     5,
-       6,   191,   192,   193,     7,     0,     8,   150,    10,    11,
-     194,   195,   196,    12,    13,    14,    15,    16,   197,    17,
-      18,    89,    19,    20,   198,    21,    22,    23,    24,    25,
-     199,     0,    56,     2,    79,    80,    81,    82,    83,    84,
-      85,    90,     0,   122,     0,     0,     0,     0,     0,    91,
-      92,    93,    94,    95,    96,     0,     0,     0,     0,     0,
-      86,    87,     0,     0,   201,   189,   190,     0,     0,   191,
-     192,   193,     0,     0,     0,   247,     0,     0,   194,   195,
-     196,     0,     0,     0,     0,     0,   197,     0,     0,    89,
-       0,     0,   198,     0,     0,     0,     0,    56,   199,    79,
-      80,    81,    82,    83,    84,    85,     0,     0,     0,    90,
-       0,   122,     0,     0,     0,     0,     0,    91,    92,    93,
-      94,    95,    96,     0,     0,    86,    87,     0,     0,     0,
-       0,     0,   201,     0,     0,     0,     0,     0,     0,     0,
-     247,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    89,     0,     0,     0,     0,     0,
-      56,     0,    79,    80,    81,    82,    83,    84,    85,     0,
-       0,     0,     0,     0,    90,     0,     0,     0,     0,     0,
-       0,     0,    91,    92,    93,    94,    95,    96,    86,    87,
-       0,     0,     0,     0,     0,     0,     0,   305,     0,     0,
-       0,     0,     0,   247,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    89,     0,     0,
-       0,     0,     0,    56,     0,    79,    80,    81,    82,    83,
-      84,    85,     0,     0,     0,     0,     0,    90,     0,     0,
-       0,     0,     0,     0,     0,    91,    92,    93,    94,    95,
-      96,    86,    87,     0,     0,     0,     0,     0,     0,     0,
-     356,     0,     0,     0,     0,     0,   247,     0,     0,     0,
+       0,    87,    88,     0,     0,     0,     0,     0,     0,    91,
+       0,     0,     0,     0,     0,     0,   248,    92,    93,    94,
+      95,    96,    97,     0,     0,     0,     0,     0,     0,     0,
+      90,     0,   384,     0,     0,     0,     2,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      89,     0,     0,     0,     0,     0,    56,     0,    79,    80,
-      81,    82,    83,    84,    85,     0,     0,     2,     0,     0,
-      90,     0,     0,     0,     0,     0,     0,     0,    91,    92,
-      93,    94,    95,    96,    86,    87,     0,     0,     0,     0,
-       0,     0,     0,   383,     0,     0,     0,     0,     4,   247,
-       0,     5,     6,     0,     0,     0,     7,     0,     8,     9,
-       0,    11,     0,    89,     0,     0,    13,    14,     2,    16,
-       0,    17,    18,     0,     0,    20,     0,     0,    22,    23,
-      24,    25,     0,    90,     0,     0,     0,     0,     0,     0,
-       0,    91,    92,    93,    94,    95,    96,     0,     3,     4,
-       0,     0,     5,     6,     0,     0,   398,     7,     0,     8,
-       9,    10,    11,     0,     0,     0,    12,    13,    14,    15,
-      16,     0,    17,    18,     0,    19,    20,     0,    21,    22,
-      23,    24,    25,    56,     2,    79,    80,    81,    82,    83,
-      84,    85,     0,     0,     0,     0,   122,     0,     0,     0,
+       0,    91,     0,     0,     0,     0,     0,     0,     0,    92,
+      93,    94,    95,    96,    97,     0,     3,     4,     0,     0,
+       5,     6,     0,     0,   399,     7,     0,     8,     9,    10,
+      11,     0,     0,     0,    12,    13,    14,    15,    16,     0,
+      17,    18,     0,    19,    20,     0,    21,    22,    23,    24,
+      25,    26,    57,     2,    80,    81,    82,    83,    84,    85,
+      86,     0,     0,     0,     0,   123,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    86,    87,     0,     0,     4,   123,     0,     5,     6,
-       0,     0,     0,     7,     0,     8,   150,     0,    11,     0,
-       0,     0,     0,    13,    14,     0,    16,     0,    17,    18,
-      89,     0,    20,     0,     0,    22,    23,    24,    25,    56,
-       2,    79,    80,    81,    82,    83,    84,    85,     0,     0,
-      90,     0,   248,     0,     0,     0,     0,     0,    91,    92,
-      93,    94,    95,    96,     0,     0,     0,    86,    87,     0,
+      87,    88,     0,     0,     4,   124,     0,     5,     6,     0,
+       0,     0,     7,     0,     8,   151,     0,    11,     0,     0,
+       0,     0,    13,    14,     0,    16,     0,    17,    18,    90,
+       0,    20,     0,     0,     0,    23,    24,    25,    26,    57,
+       2,    80,    81,    82,    83,    84,    85,    86,     0,     0,
+      91,     0,   249,     0,     0,     0,     0,     0,    92,    93,
+      94,    95,    96,    97,     0,     0,     0,    87,    88,     0,
        0,     4,     0,     0,     5,     6,     0,     0,     0,     7,
-       0,     8,   150,     0,    11,     0,     0,     0,     0,    13,
-      14,     0,    16,     0,    17,    18,    89,     0,    20,     0,
-       0,    22,    23,    24,    25,    56,     0,    79,    80,    81,
-      82,    83,    84,    85,     0,     0,    90,     0,     0,     0,
-       0,     0,     0,     0,    91,    92,    93,    94,    95,    96,
-       0,     0,     0,    86,    87,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    88,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    89,     0,     0,     0,     0,     0,    56,     0,
-      79,    80,    81,    82,    83,    84,    85,     0,     0,     0,
-       0,     0,    90,     0,   216,   389,     0,     0,     0,     0,
-      91,    92,    93,    94,    95,    96,    86,    87,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    88,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    89,     0,     0,     0,     0,
-       0,    56,     0,    79,    80,    81,    82,    83,    84,    85,
-       0,     0,     0,     0,     0,    90,     0,   216,     0,     0,
-       0,     0,     0,    91,    92,    93,    94,    95,    96,    86,
-      87,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    88,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    89,     0,
-       0,     0,     0,     0,    56,     0,    79,    80,    81,    82,
-      83,    84,    85,     0,     0,     0,     0,     0,    90,     0,
-       0,     0,     0,   227,     0,     0,    91,    92,    93,    94,
-      95,    96,    86,    87,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    88,     0,     0,
+       0,     8,   151,     0,    11,     0,     0,     0,     0,    13,
+      14,     0,    16,     0,    17,    18,    90,     0,    20,     0,
+       0,     0,    23,    24,    25,    26,    57,     0,    80,    81,
+      82,    83,    84,    85,    86,     0,     0,    91,     0,     0,
+       0,     0,     0,     0,     0,    92,    93,    94,    95,    96,
+      97,     0,     0,     0,    87,    88,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    57,    89,
+      80,    81,    82,    83,    84,    85,    86,     0,     0,     0,
+       0,     0,     0,    90,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    87,    88,     0,     0,
+       0,     0,     0,     0,    91,     0,   217,   390,     0,     0,
+       0,    89,    92,    93,    94,    95,    96,    97,     0,     0,
+       0,     0,     0,     0,    57,    90,    80,    81,    82,    83,
+      84,    85,    86,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    91,     0,   217,     0,
+       0,     0,    87,    88,    92,    93,    94,    95,    96,    97,
+       0,     0,     0,     0,     0,     0,    57,    89,    80,    81,
+      82,    83,    84,    85,    86,     0,     0,     0,     0,     0,
+       0,    90,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    87,    88,     0,     0,     0,     0,
+       0,     0,    91,     0,     0,     0,     0,   228,     0,    89,
+      92,    93,    94,    95,    96,    97,     0,     0,     0,     0,
+       0,     0,    57,    90,    80,    81,    82,    83,    84,    85,
+      86,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    91,   274,     0,     0,     0,     0,
+      87,    88,    92,    93,    94,    95,    96,    97,     0,     0,
+       0,     0,     0,     0,    57,    89,    80,    81,    82,    83,
+      84,    85,    86,     0,     0,     0,     0,     0,     0,    90,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    89,     0,     0,     0,     0,     0,    56,     0,    79,
-      80,    81,    82,    83,    84,    85,     0,     0,     0,     0,
-       0,    90,   273,     0,     0,     0,     0,     0,     0,    91,
-      92,    93,    94,    95,    96,    86,    87,     0,     0,     0,
+       0,     0,    87,    88,     0,     0,     0,     0,     0,     0,
+      91,     0,     0,     0,     0,   344,     0,    89,    92,    93,
+      94,    95,    96,    97,     0,     0,     0,     0,     0,     0,
+      57,    90,    80,    81,    82,    83,    84,    85,    86,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      88,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    89,     0,     0,     0,     0,     0,
-      56,     0,    79,    80,    81,    82,    83,    84,    85,     0,
-       0,     0,     0,     0,    90,     0,     0,     0,     0,   343,
-       0,     0,    91,    92,    93,    94,    95,    96,    86,    87,
+       0,     0,    91,     0,     0,     0,     0,   378,    87,    88,
+      92,    93,    94,    95,    96,    97,     0,     0,     0,     0,
+       0,     0,    57,   248,    80,    81,    82,    83,    84,    85,
+      86,     0,     0,     0,     0,     0,     0,    90,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    88,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    89,     0,     0,
-       0,     0,     0,    56,     0,    79,    80,    81,    82,    83,
-      84,    85,     0,     0,     0,     0,     0,    90,     0,     0,
-       0,     0,   377,     0,     0,    91,    92,    93,    94,    95,
-      96,    86,    87,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   247,     0,     0,     0,
+      87,    88,     0,     0,     0,     0,     0,     0,    91,   396,
+       0,     0,     0,     0,     0,   248,    92,    93,    94,    95,
+      96,    97,     0,     0,     0,     0,     0,     0,    57,    90,
+      80,    81,    82,    83,    84,    85,    86,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      89,     0,     0,     0,     0,     0,    56,     0,    79,    80,
-      81,    82,    83,    84,    85,     0,     0,     0,     0,     0,
-      90,   395,     0,     0,     0,     0,     0,     0,    91,    92,
-      93,    94,    95,    96,    86,    87,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   247,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    89,     0,     0,     0,     0,     0,    56,
-       0,    79,    80,    81,    82,    83,    84,    85,     0,     0,
-       0,     0,     0,    90,   406,     0,     0,     0,     0,     0,
-       0,    91,    92,    93,    94,    95,    96,    86,    87,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   247,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    89,     0,     0,     0,
-       0,     0,    56,     0,    79,    80,    81,    82,    83,    84,
-      85,     0,     0,     0,     0,     0,    90,   408,     0,     0,
-       0,     0,     0,     0,    91,    92,    93,    94,    95,    96,
-      86,    87,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   247,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    89,
-       0,     0,     0,     0,     0,    56,     0,    79,    80,    81,
-      82,    83,    84,    85,     0,     0,     0,     0,     0,    90,
-     418,     0,     0,     0,     0,     0,     0,    91,    92,    93,
-      94,    95,    96,    86,    87,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    88,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    89,     0,     0,     0,     0,     0,    56,     0,
-      79,    80,    81,    82,    83,    84,    85,     0,     0,     0,
-       0,     0,    90,     0,     0,     0,     0,     0,     0,     0,
-      91,    92,    93,    94,    95,    96,    86,    87,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    88,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    89,     0,     0,     0,     0,
-       0,    56,     0,    79,    80,    81,    82,    83,    84,    85,
-       0,     0,     0,     0,     0,   144,     0,     0,     0,     0,
-       0,     0,     0,    91,    92,    93,    94,    95,    96,    86,
-      87,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    88,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    89,     0,
-       0,     0,     0,     0,    56,     0,    79,    80,    81,    82,
-      83,    84,    85,     0,     0,     0,     0,     0,   148,     0,
-       0,     0,     0,     0,     0,     0,    91,    92,    93,    94,
-      95,    96,    86,    87,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   247,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    89,     0,     0,     0,     0,     0,    56,     0,    79,
-      80,    81,    82,    83,    84,    85,     0,     0,     0,     0,
-       0,    90,     0,     0,     0,     0,     0,     0,     0,    91,
-      92,    93,    94,    95,    96,    86,    87,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     247,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    89,     0,     0,    56,     2,     0,
-       0,     0,     0,     0,     0,     0,   221,     0,     0,     0,
-       0,     0,     0,     0,   250,     0,     0,     0,     0,     0,
-       0,     0,    91,    92,    93,    94,    95,    96,     3,     4,
-       0,     0,     5,     6,     0,     0,     0,     7,     0,     8,
-       9,    10,    11,     0,     0,     0,    12,    13,    14,    15,
-      16,     0,    17,    18,     0,    19,    20,     2,    21,    22,
-      23,    24,    25,     0,     0,   221,     0,     0,     0,     0,
-       0,     0,     0,     0,   315,   340,     0,     0,   267,     0,
-       0,     0,     0,    58,     0,     0,     0,     3,     4,     0,
-       0,     5,     6,    76,     1,     0,     7,     2,     8,     9,
+      91,   407,     0,     0,     0,     0,    87,    88,    92,    93,
+      94,    95,    96,    97,     0,     0,     0,     0,     0,     0,
+      57,   248,    80,    81,    82,    83,    84,    85,    86,     0,
+       0,     0,     0,     0,     0,    90,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    87,    88,
+       0,     0,     0,     0,     0,     0,    91,   409,     0,     0,
+       0,     0,     0,   248,    92,    93,    94,    95,    96,    97,
+       0,     0,     0,     0,     0,     0,    57,    90,    80,    81,
+      82,    83,    84,    85,    86,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    91,   419,
+       0,     0,     0,     0,    87,    88,    92,    93,    94,    95,
+      96,    97,     0,     0,     0,     0,     0,     0,    57,    89,
+      80,    81,    82,    83,    84,    85,    86,     0,     0,     0,
+       0,     0,     0,    90,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    87,    88,     0,     0,
+       0,     0,     0,     0,    91,     0,     0,     0,     0,     0,
+       0,    89,    92,    93,    94,    95,    96,    97,     0,     0,
+       0,     0,     0,     0,    57,    90,    80,    81,    82,    83,
+      84,    85,    86,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   145,     0,     0,     0,
+       0,     0,    87,    88,    92,    93,    94,    95,    96,    97,
+       0,     0,     0,     0,     0,     0,    57,    89,    80,    81,
+      82,    83,    84,    85,    86,     0,     0,     0,     0,     0,
+       0,    90,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    87,    88,     0,     0,     0,     0,
+       0,     0,   149,     0,     0,     0,     0,     0,     0,   248,
+      92,    93,    94,    95,    96,    97,     0,     0,     0,     0,
+       0,     0,    57,    90,    80,    81,    82,    83,    84,    85,
+      86,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      57,     2,     0,     0,    91,     0,     0,     0,     0,   222,
+      87,    88,    92,    93,    94,    95,    96,    97,     0,     0,
+       0,     0,     0,     0,     0,   248,     0,     0,     0,     0,
+       0,     3,     4,     0,     0,     5,     6,     0,     0,    90,
+       7,     0,     8,     9,    10,    11,     0,     0,     0,    12,
+      13,    14,    15,    16,     0,    17,    18,     0,    19,    20,
+     251,    21,    22,    23,    24,    25,    26,     2,    92,    93,
+      94,    95,    96,    97,     0,   222,     0,     0,   316,   341,
+       0,     0,   268,     0,     0,     0,     0,    59,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     3,     4,     0,
+       0,     5,     6,     0,     0,     0,     7,     0,     8,     9,
       10,    11,     0,     0,     0,    12,    13,    14,    15,    16,
        0,    17,    18,     0,    19,    20,     0,    21,    22,    23,
-      24,    25,     0,     0,     0,     0,     0,     3,     4,     0,
-       0,     5,     6,   266,   340,     0,     7,   267,     8,     9,
-      10,    11,    58,     2,     0,    12,    13,    14,    15,    16,
+      24,    25,    26,    77,     1,     0,     0,     2,     0,     0,
+       0,     0,     0,     0,   267,   341,     0,     0,   268,     0,
+       0,     0,     0,    59,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     3,     4,     0,
+       0,     5,     6,     0,     0,     0,     7,     0,     8,     9,
+      10,    11,     0,     2,     0,    12,    13,    14,    15,    16,
        0,    17,    18,     0,    19,    20,     0,    21,    22,    23,
-      24,    25,     0,    26,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,     0,     4,     0,     0,     5,     6,     2,
-       0,     0,     7,     0,     8,     9,     0,    11,     0,     0,
+      24,    25,    26,     0,    27,    28,    29,    30,    31,    32,
+      33,    34,    35,    36,     4,     0,     0,     5,     6,     0,
+       2,     0,     7,     0,     8,     9,     0,    11,     0,     0,
        0,     0,    13,    14,     0,    16,     0,    17,    18,     0,
-       0,    20,     0,     0,    22,    23,    24,    25,     0,     0,
-       4,     0,     0,     5,     6,     0,     0,     0,     7,     0,
-       8,     9,   230,    11,     0,     0,     0,     1,    13,    14,
-       2,    16,     0,    17,    18,     0,     0,    20,     0,     0,
-      22,    23,    24,    25,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   327,     0,
+       0,    20,     0,     0,     0,    23,    24,    25,    26,     0,
+       0,     4,     0,     0,     5,     6,     0,     1,     0,     7,
+       2,     8,     9,   231,    11,     0,     0,     0,     0,    13,
+      14,     0,    16,     0,    17,    18,     0,     0,    20,     0,
+       0,     0,    23,    24,    25,    26,     0,     0,     0,     0,
        3,     4,     0,     0,     5,     6,     0,     0,     0,     7,
-       0,     8,     9,    10,    11,     0,     0,     0,    12,    13,
+     328,     8,     9,    10,    11,     0,     0,     0,    12,    13,
       14,    15,    16,     0,    17,    18,     0,    19,    20,     0,
-      21,    22,    23,    24,    25,     0,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,    35,    56,     2,     0,     0,
-       0,     0,     0,     0,     0,   221,     0,     0,     0,     0,
+      21,    22,    23,    24,    25,    26,     0,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    57,     2,     0,
+       0,     0,     0,     0,     0,     0,   222,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     3,     4,     0,
-       0,     5,     6,     0,     2,     0,     7,     0,     8,     9,
-      10,    11,     0,     0,     0,    12,    13,    14,    15,    16,
-       0,    17,    18,     0,    19,    20,     0,    21,    22,    23,
-      24,    25,     0,     0,     3,     4,     0,     0,     5,     6,
-       0,     0,     2,     7,   222,     8,     9,    10,    11,     0,
-     221,     0,    12,    13,    14,    15,    16,     0,    17,    18,
-       0,    19,    20,     0,    21,    22,    23,    24,    25,     0,
-       0,     0,     3,     4,     0,     0,     5,     6,     0,     2,
-       0,     7,   122,     8,     9,    10,    11,   221,     0,     0,
-      12,    13,    14,    15,    16,     0,    17,    18,     0,    19,
-      20,     0,    21,    22,    23,    24,    25,     0,     0,     3,
-       4,     0,     0,     5,     6,     2,     0,     0,     7,   375,
+       0,     0,     0,     0,     0,     0,     0,     0,     3,     4,
+       0,     0,     5,     6,     0,     0,     2,     7,     0,     8,
+       9,    10,    11,     0,     0,     0,    12,    13,    14,    15,
+      16,     0,    17,    18,     0,    19,    20,     0,    21,    22,
+      23,    24,    25,    26,     0,     0,     3,     4,     0,     0,
+       5,     6,     0,     0,     0,     7,   223,     8,     9,    10,
+      11,     0,     0,     0,    12,    13,    14,    15,    16,     0,
+      17,    18,     0,    19,    20,     2,    21,    22,    23,    24,
+      25,    26,     0,   222,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   123,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     3,     4,     0,     0,     5,
+       6,     0,     0,     2,     7,     0,     8,     9,    10,    11,
+       0,   222,     0,    12,    13,    14,    15,    16,     0,    17,
+      18,     0,    19,    20,     0,    21,    22,    23,    24,    25,
+      26,     0,     0,     3,     4,     0,     0,     5,     6,     2,
+       0,     0,     7,   376,     8,     9,    10,    11,     0,     0,
+       0,    12,    13,    14,    15,    16,     0,    17,    18,     0,
+      19,    20,     0,    21,    22,    23,    24,    25,    26,     3,
+       4,     0,     0,     5,     6,     2,     0,     0,     7,     0,
        8,     9,    10,    11,     0,     0,     0,    12,    13,    14,
       15,    16,     0,    17,    18,     0,    19,    20,     0,    21,
-      22,    23,    24,    25,     0,     3,     4,     0,     0,     5,
-       6,     0,     0,     0,     7,     0,     8,     9,    10,    11,
-       0,     0,     0,    12,    13,    14,    15,    16,     0,    17,
-      18,     0,    19,    20,     0,    21,    22,    23,    24,    25
+      22,    23,    24,    25,    26,     0,     4,     0,     0,     5,
+       6,     0,     0,     0,     7,     0,     8,     9,     0,    11,
+       0,     0,     0,     0,    13,    14,     0,    16,     0,    17,
+      18,     0,     0,    20,     0,     0,     0,    23,    24,    25,
+      26
 };
 
 static const yytype_int16 yycheck[] =
 {
-      37,    65,    51,   210,    41,    58,    43,     0,    41,    68,
-      43,   216,    90,   132,   190,     3,   102,    80,     3,     3,
-      57,   128,    37,   123,     0,   155,     3,    82,    65,   129,
-      41,    90,    43,    30,     3,   268,     3,    82,     3,    87,
-      90,    78,     3,     4,    63,    38,    39,    87,     3,     3,
-       4,    44,    45,   131,    47,   103,   232,   135,    87,    87,
-      80,   161,    87,   103,    84,     9,   119,     3,    27,    28,
-     148,    47,   131,   132,   103,   103,   135,   136,   103,   165,
-     166,   167,    83,   120,   317,   122,    87,    63,   125,   148,
-      80,   128,    80,   223,   144,    80,    84,   134,   148,    83,
-     150,   138,   155,   100,    51,   120,    83,    85,   127,    87,
-     125,   122,   162,    80,    80,    80,   216,    87,   237,   134,
-      80,    82,    89,   160,    89,    80,   163,   160,    82,   336,
-     163,   101,    88,   183,    89,   128,   103,    96,    97,    86,
-      87,   190,    89,    29,    80,    87,   101,   197,    84,   160,
-     326,   127,   163,    89,   330,   102,   193,    98,   195,    39,
-     365,   103,   195,   263,    87,   265,    46,   267,    99,    89,
-     223,    81,   250,   210,    94,    95,    56,    87,   237,    81,
-     103,    81,   193,   232,   195,   271,   223,    87,    68,    80,
-      83,   250,    82,    84,    87,   142,   143,   247,    89,   210,
-     250,    80,   239,    81,    81,    84,    81,   244,   223,    89,
-      87,   248,    87,   266,   102,    31,    32,    33,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   193,   248,    81,   346,
-      81,   101,    81,   190,    87,    81,    87,   347,    87,    81,
-     350,    87,   302,   317,   304,    87,   103,   307,   308,   103,
-      81,    81,   315,   300,    80,   365,    87,    87,    84,    81,
-      86,    80,   309,   266,    80,    87,    81,   326,   315,    80,
-     317,   330,    87,    84,    81,   232,    81,   324,    80,   300,
-      87,    80,    87,    83,   101,   332,    81,    87,   309,   336,
-      21,    22,   352,    90,    91,   101,   356,    25,    26,   324,
-     172,   173,   174,   175,     3,     4,   353,   168,   169,   101,
-     170,   171,   315,    85,   271,   336,   101,   320,   176,   177,
-     102,    81,   382,   383,    81,   385,    87,   101,    69,    81,
-     103,    85,   353,   300,    80,    85,    81,   397,   398,   386,
-     387,   388,   309,   346,    44,   103,   178,   180,   395,   120,
-     410,   179,   181,   136,   138,   182,   324,   320,   405,   406,
-     139,   408,   128,    47,   411,   386,   387,   388,   415,   326,
-     417,   418,   148,   330,   395,   248,    -1,   424,    -1,    -1,
-      -1,    58,    -1,    -1,   405,   406,   353,   408,    -1,    -1,
-     411,    68,    -1,    -1,   415,    -1,   417,   418,    -1,    -1,
-      -1,    -1,    -1,   424,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    90,    -1,    -1,    -1,    -1,    -1,   386,
-     387,   388,    -1,    -1,    -1,    -1,    -1,    -1,   395,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   405,   406,
-      -1,   408,   119,    -1,   411,    -1,    -1,    -1,   415,    -1,
-     417,   418,    -1,    -1,   131,   132,    -1,   424,   135,   136,
-      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      -1,   148,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    31,
-      32,    -1,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    -1,    45,    46,    47,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,    66,    67,    68,    69,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    80,    -1,
-      82,    83,    -1,    -1,    -1,    -1,    88,    89,    90,    91,
-      92,    93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     237,   103,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    -1,    -1,   250,    13,    14,    15,    16,    17,    18,
-      19,    20,    -1,    -1,    23,    24,    -1,    -1,    -1,    -1,
-      31,    32,    -1,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    -1,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    67,    68,    69,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    80,
-      -1,    82,    83,    -1,    -1,    -1,    -1,    88,    89,    90,
-      91,    92,    93,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,   103,   102,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    31,    32,    -1,    34,    35,    36,    37,    38,    39,
-      40,    41,    42,    43,    -1,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      80,    -1,    82,    83,    -1,    -1,    -1,    -1,    88,    89,
-      90,    91,    92,    93,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,   103,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    31,    32,    -1,    34,    35,    36,    37,    38,
+      38,    66,    52,     0,    42,    59,    44,     0,    42,    69,
+      44,   217,   211,   133,   191,     3,   103,    91,     3,    30,
+      58,   129,    38,   124,   156,     3,     3,     4,    66,   130,
+      42,    91,    44,   269,    81,     3,     3,     3,    27,    28,
+      91,    79,     3,    88,    88,    81,    39,    40,    83,    88,
+       3,    48,    45,    46,    83,    48,   233,    64,   132,   104,
+     104,   162,   136,   102,     3,     4,   120,    64,    88,     3,
+      88,    88,   132,   133,    84,   149,   136,   137,    88,   166,
+     167,   168,   318,   121,   104,   123,   104,   104,   126,   149,
+     101,   129,   224,    89,   145,    81,    84,   135,   149,    84,
+     151,   139,   156,    81,    52,   121,    83,    85,    97,    98,
+     126,   123,   163,    81,    81,    81,   217,    81,   238,   135,
+      81,   128,    90,   161,    90,     9,   164,   161,    81,    90,
+     164,   128,    85,   184,   102,   100,   129,    90,   337,    87,
+      88,   191,    90,   104,    83,    88,    86,   198,    88,   161,
+     327,    82,   164,    88,   331,   103,   194,    88,   196,    29,
+     366,   104,   196,   264,    39,   266,    99,   268,    81,   104,
+     224,    46,    85,   211,    90,    21,    22,   251,   238,    95,
+      96,    56,   194,   233,   196,   272,   224,    82,    31,    32,
+      33,   251,    82,    88,    69,   143,   144,   248,    88,   211,
+     251,    81,   240,    82,    82,    85,    82,   245,   224,    88,
+      90,   249,    88,   267,    83,    90,     3,     4,   166,   167,
+     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,   180,   181,   182,   183,   194,   249,    81,   347,
+      82,    82,    85,   191,    87,    82,    88,   348,   103,    82,
+     351,    88,   303,   318,   305,    88,   104,   308,   309,   104,
+      82,    82,   316,   301,    82,   366,    88,    88,   102,    82,
+      88,    81,   310,    82,   267,    88,    82,   327,   316,    88,
+     318,   331,    88,   102,    82,   233,    81,   325,    84,   301,
+      88,    81,    88,    81,   102,   333,    81,    85,   310,   337,
+      85,    84,   353,    25,    26,    88,   357,    91,    92,   325,
+     169,   170,    59,   171,   172,    81,   354,   173,   174,   175,
+     176,   102,    69,   316,   272,   337,   177,   178,   321,    86,
+     102,    82,   383,   384,   103,   386,    82,    82,    88,   102,
+      70,    82,   354,   301,    91,   104,    86,   398,   399,   387,
+     388,   389,   310,    81,   347,    82,    44,    86,   396,   179,
+     411,   104,   137,   180,   140,   181,   121,   182,   406,   407,
+     325,   409,   183,   120,   412,   387,   388,   389,   416,   327,
+     418,   419,   149,   331,   396,   132,   133,   425,   249,   136,
+     137,   139,   321,   129,   406,   407,   354,   409,    48,    -1,
+     412,    -1,   149,    -1,   416,    -1,   418,   419,    -1,    -1,
+      -1,    -1,    -1,   425,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   387,
+     388,   389,    -1,    -1,    -1,    -1,    -1,    -1,   396,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   406,   407,
+      -1,   409,    -1,    -1,   412,    -1,    -1,    -1,   416,    -1,
+     418,   419,    -1,    -1,    -1,    -1,    -1,   425,    -1,    -1,
+      -1,    -1,    -1,    -1,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   238,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    31,    32,   251,    34,    35,    36,    37,    38,
       39,    40,    41,    42,    43,    -1,    45,    46,    47,    48,
       49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
       59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    -1,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    80,    -1,    82,    -1,    -1,    -1,    -1,    -1,    88,
-      89,    90,    91,    92,    93,    -1,    -1,    -1,    -1,    -1,
-      31,    32,    -1,    -1,   103,    36,    37,    -1,    -1,    40,
-      41,    42,    -1,    -1,    -1,    46,    -1,    -1,    49,    50,
-      51,    -1,    -1,    -1,    -1,    -1,    57,    -1,    -1,    60,
-      -1,    -1,    63,    -1,    -1,    -1,    -1,     3,    69,     5,
-       6,     7,     8,     9,    10,    11,    -1,    -1,    -1,    80,
-      -1,    82,    -1,    -1,    -1,    -1,    -1,    88,    89,    90,
-      91,    92,    93,    -1,    -1,    31,    32,    -1,    -1,    -1,
-      -1,    -1,   103,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    60,    -1,    -1,    -1,    -1,    -1,
-       3,    -1,     5,     6,     7,     8,     9,    10,    11,    -1,
-      -1,    -1,    -1,    -1,    80,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    88,    89,    90,    91,    92,    93,    31,    32,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   103,    -1,    -1,
-      -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    60,    -1,    -1,
-      -1,    -1,    -1,     3,    -1,     5,     6,     7,     8,     9,
-      10,    11,    -1,    -1,    -1,    -1,    -1,    80,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    88,    89,    90,    91,    92,
-      93,    31,    32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     103,    -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,
+      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    81,    -1,    83,    84,    -1,    -1,    -1,    -1,
+      89,    90,    91,    92,    93,    94,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,   104,    -1,    -1,    13,    14,
+      15,    16,    17,    18,    19,    20,    -1,    -1,    23,    24,
+      -1,    -1,    -1,    -1,    31,    32,    -1,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    -1,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    81,    -1,    83,    84,    -1,    -1,
+      -1,    -1,    89,    90,    91,    92,    93,    94,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,   104,   103,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      60,    -1,    -1,    -1,    -1,    -1,     3,    -1,     5,     6,
-       7,     8,     9,    10,    11,    -1,    -1,     4,    -1,    -1,
-      80,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,    89,
-      90,    91,    92,    93,    31,    32,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   103,    -1,    -1,    -1,    -1,    35,    46,
-      -1,    38,    39,    -1,    -1,    -1,    43,    -1,    45,    46,
-      -1,    48,    -1,    60,    -1,    -1,    53,    54,     4,    56,
-      -1,    58,    59,    -1,    -1,    62,    -1,    -1,    65,    66,
-      67,    68,    -1,    80,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    88,    89,    90,    91,    92,    93,    -1,    34,    35,
-      -1,    -1,    38,    39,    -1,    -1,   103,    43,    -1,    45,
-      46,    47,    48,    -1,    -1,    -1,    52,    53,    54,    55,
-      56,    -1,    58,    59,    -1,    61,    62,    -1,    64,    65,
-      66,    67,    68,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    -1,    -1,    -1,    -1,    82,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    31,    32,    -1,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    -1,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    81,    -1,    83,    84,
+      -1,    -1,    -1,    -1,    89,    90,    91,    92,    93,    94,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,   104,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    31,    32,
+      -1,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      43,    -1,    45,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    -1,     3,
+       4,     5,     6,     7,     8,     9,    10,    11,    81,    -1,
+      83,    -1,    -1,    -1,    -1,    -1,    89,    90,    91,    92,
+      93,    94,    -1,    -1,    -1,    -1,    -1,    31,    32,    -1,
+      -1,   104,    36,    37,    -1,    -1,    40,    41,    42,    -1,
+      -1,    -1,    46,    -1,    -1,    49,    50,    51,    -1,    -1,
+      -1,    -1,    -1,    57,    -1,    -1,    60,    -1,    -1,    63,
+      -1,    -1,    -1,    -1,    -1,     3,    70,     5,     6,     7,
+       8,     9,    10,    11,    -1,    -1,    -1,    81,    -1,    83,
+      -1,    -1,    -1,    -1,    -1,    89,    90,    91,    92,    93,
+      94,    -1,    -1,    31,    32,    -1,    -1,    -1,    -1,    -1,
+     104,    -1,    -1,    -1,    -1,    -1,    -1,     3,    46,     5,
+       6,     7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,
+      -1,    -1,    60,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    31,    32,    -1,    -1,    -1,
+      -1,    -1,    -1,    81,    -1,    -1,    -1,    -1,    -1,    -1,
+      46,    89,    90,    91,    92,    93,    94,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    60,    -1,   104,    -1,    -1,    -1,
+      -1,     3,    -1,     5,     6,     7,     8,     9,    10,    11,
+      -1,    -1,    -1,    -1,    -1,    81,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    89,    90,    91,    92,    93,    94,    31,
+      32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   104,    -1,
+      -1,    -1,    -1,     3,    46,     5,     6,     7,     8,     9,
+      10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    60,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    31,    32,    -1,    -1,    -1,    -1,    -1,    -1,    81,
+      -1,    -1,    -1,    -1,    -1,    -1,    46,    89,    90,    91,
+      92,    93,    94,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      60,    -1,   104,    -1,    -1,    -1,     4,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    81,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    89,
+      90,    91,    92,    93,    94,    -1,    34,    35,    -1,    -1,
+      38,    39,    -1,    -1,   104,    43,    -1,    45,    46,    47,
+      48,    -1,    -1,    -1,    52,    53,    54,    55,    56,    -1,
+      58,    59,    -1,    61,    62,    -1,    64,    65,    66,    67,
+      68,    69,     3,     4,     5,     6,     7,     8,     9,    10,
+      11,    -1,    -1,    -1,    -1,    83,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    31,    32,    -1,    -1,    35,   102,    -1,    38,    39,
-      -1,    -1,    -1,    43,    -1,    45,    46,    -1,    48,    -1,
-      -1,    -1,    -1,    53,    54,    -1,    56,    -1,    58,    59,
-      60,    -1,    62,    -1,    -1,    65,    66,    67,    68,     3,
+      31,    32,    -1,    -1,    35,   103,    -1,    38,    39,    -1,
+      -1,    -1,    43,    -1,    45,    46,    -1,    48,    -1,    -1,
+      -1,    -1,    53,    54,    -1,    56,    -1,    58,    59,    60,
+      -1,    62,    -1,    -1,    -1,    66,    67,    68,    69,     3,
        4,     5,     6,     7,     8,     9,    10,    11,    -1,    -1,
-      80,    -1,    82,    -1,    -1,    -1,    -1,    -1,    88,    89,
-      90,    91,    92,    93,    -1,    -1,    -1,    31,    32,    -1,
+      81,    -1,    83,    -1,    -1,    -1,    -1,    -1,    89,    90,
+      91,    92,    93,    94,    -1,    -1,    -1,    31,    32,    -1,
       -1,    35,    -1,    -1,    38,    39,    -1,    -1,    -1,    43,
       -1,    45,    46,    -1,    48,    -1,    -1,    -1,    -1,    53,
       54,    -1,    56,    -1,    58,    59,    60,    -1,    62,    -1,
-      -1,    65,    66,    67,    68,     3,    -1,     5,     6,     7,
-       8,     9,    10,    11,    -1,    -1,    80,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    88,    89,    90,    91,    92,    93,
-      -1,    -1,    -1,    31,    32,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    60,    -1,    -1,    -1,    -1,    -1,     3,    -1,
+      -1,    -1,    66,    67,    68,    69,     3,    -1,     5,     6,
+       7,     8,     9,    10,    11,    -1,    -1,    81,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    89,    90,    91,    92,    93,
+      94,    -1,    -1,    -1,    31,    32,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,    46,
        5,     6,     7,     8,     9,    10,    11,    -1,    -1,    -1,
-      -1,    -1,    80,    -1,    82,    83,    -1,    -1,    -1,    -1,
-      88,    89,    90,    91,    92,    93,    31,    32,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    60,    -1,    -1,    -1,    -1,
-      -1,     3,    -1,     5,     6,     7,     8,     9,    10,    11,
-      -1,    -1,    -1,    -1,    -1,    80,    -1,    82,    -1,    -1,
-      -1,    -1,    -1,    88,    89,    90,    91,    92,    93,    31,
-      32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    60,    -1,
-      -1,    -1,    -1,    -1,     3,    -1,     5,     6,     7,     8,
-       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    80,    -1,
-      -1,    -1,    -1,    85,    -1,    -1,    88,    89,    90,    91,
-      92,    93,    31,    32,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    60,    -1,    -1,    -1,    -1,    -1,     3,    -1,     5,
-       6,     7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,
-      -1,    80,    81,    -1,    -1,    -1,    -1,    -1,    -1,    88,
-      89,    90,    91,    92,    93,    31,    32,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    60,    -1,    -1,    -1,    -1,    -1,
-       3,    -1,     5,     6,     7,     8,     9,    10,    11,    -1,
-      -1,    -1,    -1,    -1,    80,    -1,    -1,    -1,    -1,    85,
-      -1,    -1,    88,    89,    90,    91,    92,    93,    31,    32,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    60,    -1,    -1,
-      -1,    -1,    -1,     3,    -1,     5,     6,     7,     8,     9,
-      10,    11,    -1,    -1,    -1,    -1,    -1,    80,    -1,    -1,
-      -1,    -1,    85,    -1,    -1,    88,    89,    90,    91,    92,
-      93,    31,    32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      60,    -1,    -1,    -1,    -1,    -1,     3,    -1,     5,     6,
+      -1,    -1,    -1,    60,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    31,    32,    -1,    -1,
+      -1,    -1,    -1,    -1,    81,    -1,    83,    84,    -1,    -1,
+      -1,    46,    89,    90,    91,    92,    93,    94,    -1,    -1,
+      -1,    -1,    -1,    -1,     3,    60,     5,     6,     7,     8,
+       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    81,    -1,    83,    -1,
+      -1,    -1,    31,    32,    89,    90,    91,    92,    93,    94,
+      -1,    -1,    -1,    -1,    -1,    -1,     3,    46,     5,     6,
        7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
-      80,    81,    -1,    -1,    -1,    -1,    -1,    -1,    88,    89,
-      90,    91,    92,    93,    31,    32,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,
+      -1,    60,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    31,    32,    -1,    -1,    -1,    -1,
+      -1,    -1,    81,    -1,    -1,    -1,    -1,    86,    -1,    46,
+      89,    90,    91,    92,    93,    94,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,    60,     5,     6,     7,     8,     9,    10,
+      11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    81,    82,    -1,    -1,    -1,    -1,
+      31,    32,    89,    90,    91,    92,    93,    94,    -1,    -1,
+      -1,    -1,    -1,    -1,     3,    46,     5,     6,     7,     8,
+       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    60,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    60,    -1,    -1,    -1,    -1,    -1,     3,
-      -1,     5,     6,     7,     8,     9,    10,    11,    -1,    -1,
-      -1,    -1,    -1,    80,    81,    -1,    -1,    -1,    -1,    -1,
-      -1,    88,    89,    90,    91,    92,    93,    31,    32,    -1,
+      -1,    -1,    31,    32,    -1,    -1,    -1,    -1,    -1,    -1,
+      81,    -1,    -1,    -1,    -1,    86,    -1,    46,    89,    90,
+      91,    92,    93,    94,    -1,    -1,    -1,    -1,    -1,    -1,
+       3,    60,     5,     6,     7,     8,     9,    10,    11,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    60,    -1,    -1,    -1,
-      -1,    -1,     3,    -1,     5,     6,     7,     8,     9,    10,
-      11,    -1,    -1,    -1,    -1,    -1,    80,    81,    -1,    -1,
-      -1,    -1,    -1,    -1,    88,    89,    90,    91,    92,    93,
-      31,    32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    60,
-      -1,    -1,    -1,    -1,    -1,     3,    -1,     5,     6,     7,
-       8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,    80,
-      81,    -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    90,
-      91,    92,    93,    31,    32,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,    -1,
+      -1,    -1,    81,    -1,    -1,    -1,    -1,    86,    31,    32,
+      89,    90,    91,    92,    93,    94,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,    46,     5,     6,     7,     8,     9,    10,
+      11,    -1,    -1,    -1,    -1,    -1,    -1,    60,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    60,    -1,    -1,    -1,    -1,    -1,     3,    -1,
+      31,    32,    -1,    -1,    -1,    -1,    -1,    -1,    81,    82,
+      -1,    -1,    -1,    -1,    -1,    46,    89,    90,    91,    92,
+      93,    94,    -1,    -1,    -1,    -1,    -1,    -1,     3,    60,
        5,     6,     7,     8,     9,    10,    11,    -1,    -1,    -1,
-      -1,    -1,    80,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      88,    89,    90,    91,    92,    93,    31,    32,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      81,    82,    -1,    -1,    -1,    -1,    31,    32,    89,    90,
+      91,    92,    93,    94,    -1,    -1,    -1,    -1,    -1,    -1,
+       3,    46,     5,     6,     7,     8,     9,    10,    11,    -1,
       -1,    -1,    -1,    -1,    -1,    60,    -1,    -1,    -1,    -1,
-      -1,     3,    -1,     5,     6,     7,     8,     9,    10,    11,
-      -1,    -1,    -1,    -1,    -1,    80,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    88,    89,    90,    91,    92,    93,    31,
-      32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    60,    -1,
-      -1,    -1,    -1,    -1,     3,    -1,     5,     6,     7,     8,
-       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    80,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    90,    91,
-      92,    93,    31,    32,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    60,    -1,    -1,    -1,    -1,    -1,     3,    -1,     5,
-       6,     7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,
-      -1,    80,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,
-      89,    90,    91,    92,    93,    31,    32,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    60,    -1,    -1,     3,     4,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    80,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    88,    89,    90,    91,    92,    93,    34,    35,
-      -1,    -1,    38,    39,    -1,    -1,    -1,    43,    -1,    45,
-      46,    47,    48,    -1,    -1,    -1,    52,    53,    54,    55,
-      56,    -1,    58,    59,    -1,    61,    62,     4,    64,    65,
-      66,    67,    68,    -1,    -1,    12,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    80,    81,    -1,    -1,    84,    -1,
-      -1,    -1,    -1,    89,    -1,    -1,    -1,    34,    35,    -1,
-      -1,    38,    39,     0,     1,    -1,    43,     4,    45,    46,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    31,    32,
+      -1,    -1,    -1,    -1,    -1,    -1,    81,    82,    -1,    -1,
+      -1,    -1,    -1,    46,    89,    90,    91,    92,    93,    94,
+      -1,    -1,    -1,    -1,    -1,    -1,     3,    60,     5,     6,
+       7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    81,    82,
+      -1,    -1,    -1,    -1,    31,    32,    89,    90,    91,    92,
+      93,    94,    -1,    -1,    -1,    -1,    -1,    -1,     3,    46,
+       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    -1,
+      -1,    -1,    -1,    60,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    31,    32,    -1,    -1,
+      -1,    -1,    -1,    -1,    81,    -1,    -1,    -1,    -1,    -1,
+      -1,    46,    89,    90,    91,    92,    93,    94,    -1,    -1,
+      -1,    -1,    -1,    -1,     3,    60,     5,     6,     7,     8,
+       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    81,    -1,    -1,    -1,
+      -1,    -1,    31,    32,    89,    90,    91,    92,    93,    94,
+      -1,    -1,    -1,    -1,    -1,    -1,     3,    46,     5,     6,
+       7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
+      -1,    60,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    31,    32,    -1,    -1,    -1,    -1,
+      -1,    -1,    81,    -1,    -1,    -1,    -1,    -1,    -1,    46,
+      89,    90,    91,    92,    93,    94,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,    60,     5,     6,     7,     8,     9,    10,
+      11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       3,     4,    -1,    -1,    81,    -1,    -1,    -1,    -1,    12,
+      31,    32,    89,    90,    91,    92,    93,    94,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,
+      -1,    34,    35,    -1,    -1,    38,    39,    -1,    -1,    60,
+      43,    -1,    45,    46,    47,    48,    -1,    -1,    -1,    52,
+      53,    54,    55,    56,    -1,    58,    59,    -1,    61,    62,
+      81,    64,    65,    66,    67,    68,    69,     4,    89,    90,
+      91,    92,    93,    94,    -1,    12,    -1,    -1,    81,    82,
+      -1,    -1,    85,    -1,    -1,    -1,    -1,    90,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    34,    35,    -1,
+      -1,    38,    39,    -1,    -1,    -1,    43,    -1,    45,    46,
       47,    48,    -1,    -1,    -1,    52,    53,    54,    55,    56,
       -1,    58,    59,    -1,    61,    62,    -1,    64,    65,    66,
-      67,    68,    -1,    -1,    -1,    -1,    -1,    34,    35,    -1,
-      -1,    38,    39,    80,    81,    -1,    43,    84,    45,    46,
-      47,    48,    89,     4,    -1,    52,    53,    54,    55,    56,
+      67,    68,    69,     0,     1,    -1,    -1,     4,    -1,    -1,
+      -1,    -1,    -1,    -1,    81,    82,    -1,    -1,    85,    -1,
+      -1,    -1,    -1,    90,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    34,    35,    -1,
+      -1,    38,    39,    -1,    -1,    -1,    43,    -1,    45,    46,
+      47,    48,    -1,     4,    -1,    52,    53,    54,    55,    56,
       -1,    58,    59,    -1,    61,    62,    -1,    64,    65,    66,
-      67,    68,    -1,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    -1,    35,    -1,    -1,    38,    39,     4,
-      -1,    -1,    43,    -1,    45,    46,    -1,    48,    -1,    -1,
+      67,    68,    69,    -1,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    35,    -1,    -1,    38,    39,    -1,
+       4,    -1,    43,    -1,    45,    46,    -1,    48,    -1,    -1,
       -1,    -1,    53,    54,    -1,    56,    -1,    58,    59,    -1,
-      -1,    62,    -1,    -1,    65,    66,    67,    68,    -1,    -1,
-      35,    -1,    -1,    38,    39,    -1,    -1,    -1,    43,    -1,
-      45,    46,    83,    48,    -1,    -1,    -1,     1,    53,    54,
-       4,    56,    -1,    58,    59,    -1,    -1,    62,    -1,    -1,
-      65,    66,    67,    68,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    83,    -1,
+      -1,    62,    -1,    -1,    -1,    66,    67,    68,    69,    -1,
+      -1,    35,    -1,    -1,    38,    39,    -1,     1,    -1,    43,
+       4,    45,    46,    84,    48,    -1,    -1,    -1,    -1,    53,
+      54,    -1,    56,    -1,    58,    59,    -1,    -1,    62,    -1,
+      -1,    -1,    66,    67,    68,    69,    -1,    -1,    -1,    -1,
       34,    35,    -1,    -1,    38,    39,    -1,    -1,    -1,    43,
-      -1,    45,    46,    47,    48,    -1,    -1,    -1,    52,    53,
+      84,    45,    46,    47,    48,    -1,    -1,    -1,    52,    53,
       54,    55,    56,    -1,    58,    59,    -1,    61,    62,    -1,
-      64,    65,    66,    67,    68,    -1,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,     3,     4,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,
+      64,    65,    66,    67,    68,    69,    -1,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,     3,     4,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    34,    35,    -1,
-      -1,    38,    39,    -1,     4,    -1,    43,    -1,    45,    46,
-      47,    48,    -1,    -1,    -1,    52,    53,    54,    55,    56,
-      -1,    58,    59,    -1,    61,    62,    -1,    64,    65,    66,
-      67,    68,    -1,    -1,    34,    35,    -1,    -1,    38,    39,
-      -1,    -1,     4,    43,    81,    45,    46,    47,    48,    -1,
-      12,    -1,    52,    53,    54,    55,    56,    -1,    58,    59,
-      -1,    61,    62,    -1,    64,    65,    66,    67,    68,    -1,
-      -1,    -1,    34,    35,    -1,    -1,    38,    39,    -1,     4,
-      -1,    43,    82,    45,    46,    47,    48,    12,    -1,    -1,
-      52,    53,    54,    55,    56,    -1,    58,    59,    -1,    61,
-      62,    -1,    64,    65,    66,    67,    68,    -1,    -1,    34,
-      35,    -1,    -1,    38,    39,     4,    -1,    -1,    43,    81,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    34,    35,
+      -1,    -1,    38,    39,    -1,    -1,     4,    43,    -1,    45,
+      46,    47,    48,    -1,    -1,    -1,    52,    53,    54,    55,
+      56,    -1,    58,    59,    -1,    61,    62,    -1,    64,    65,
+      66,    67,    68,    69,    -1,    -1,    34,    35,    -1,    -1,
+      38,    39,    -1,    -1,    -1,    43,    82,    45,    46,    47,
+      48,    -1,    -1,    -1,    52,    53,    54,    55,    56,    -1,
+      58,    59,    -1,    61,    62,     4,    64,    65,    66,    67,
+      68,    69,    -1,    12,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    83,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    34,    35,    -1,    -1,    38,
+      39,    -1,    -1,     4,    43,    -1,    45,    46,    47,    48,
+      -1,    12,    -1,    52,    53,    54,    55,    56,    -1,    58,
+      59,    -1,    61,    62,    -1,    64,    65,    66,    67,    68,
+      69,    -1,    -1,    34,    35,    -1,    -1,    38,    39,     4,
+      -1,    -1,    43,    82,    45,    46,    47,    48,    -1,    -1,
+      -1,    52,    53,    54,    55,    56,    -1,    58,    59,    -1,
+      61,    62,    -1,    64,    65,    66,    67,    68,    69,    34,
+      35,    -1,    -1,    38,    39,     4,    -1,    -1,    43,    -1,
       45,    46,    47,    48,    -1,    -1,    -1,    52,    53,    54,
       55,    56,    -1,    58,    59,    -1,    61,    62,    -1,    64,
-      65,    66,    67,    68,    -1,    34,    35,    -1,    -1,    38,
-      39,    -1,    -1,    -1,    43,    -1,    45,    46,    47,    48,
-      -1,    -1,    -1,    52,    53,    54,    55,    56,    -1,    58,
-      59,    -1,    61,    62,    -1,    64,    65,    66,    67,    68
+      65,    66,    67,    68,    69,    -1,    35,    -1,    -1,    38,
+      39,    -1,    -1,    -1,    43,    -1,    45,    46,    -1,    48,
+      -1,    -1,    -1,    -1,    53,    54,    -1,    56,    -1,    58,
+      59,    -1,    -1,    62,    -1,    -1,    -1,    66,    67,    68,
+      69
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1582,78 +1571,78 @@ static const yytype_uint8 yystos[] =
 {
        0,     1,     4,    34,    35,    38,    39,    43,    45,    46,
       47,    48,    52,    53,    54,    55,    56,    58,    59,    61,
-      62,    64,    65,    66,    67,    68,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,   129,   130,   133,   134,
-     135,   136,   142,   143,   147,   148,   159,   171,   172,   173,
-     175,   176,   177,   178,   179,   180,     3,    80,    89,   103,
-     107,   131,   132,   149,   150,   151,   130,   130,    82,   107,
-     108,   159,    82,   108,   130,   130,     0,   172,    80,     5,
-       6,     7,     8,     9,    10,    11,    31,    32,    46,    60,
-      80,    88,    89,    90,    91,    92,    93,   105,   106,   107,
-     109,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   128,   149,   147,   151,   152,
-      87,   103,    82,   102,   129,   130,   164,   174,    80,    84,
-     150,   134,   137,   138,   139,   147,    82,   144,   145,    82,
-     107,   155,    80,    80,    80,   111,   111,    80,    80,   111,
-      46,   111,   124,   125,   127,   139,   156,     9,    31,    32,
-      33,    80,    84,    86,   113,    89,    94,    95,    90,    91,
-      21,    22,    27,    28,    96,    97,    25,    26,    88,    98,
-      99,    29,    30,   100,    81,   147,   151,   132,   149,    36,
-      37,    40,    41,    42,    49,    50,    51,    57,    63,    69,
-      83,   103,   107,   108,   127,   129,   159,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,    82,   125,   160,   129,
-     164,    12,    81,   130,   153,   154,   155,    85,   125,   139,
-      83,   138,   101,   140,   141,   149,   139,   137,    83,    87,
-     107,   146,   144,    81,    87,   111,   111,    46,    82,   156,
-      80,   127,    13,    14,    15,    16,    17,    18,    19,    20,
-      23,    24,   102,   126,    81,    87,    80,    84,   151,   157,
-     158,    81,   108,    81,   110,   125,   127,   108,   113,   113,
-     113,   114,   114,   115,   115,   116,   116,   116,   116,   117,
-     117,   118,   119,   120,   121,   122,   127,   103,   128,   103,
-     101,   162,    80,   108,    80,   103,   127,    80,    80,   101,
-     103,    83,   166,   160,   161,    80,   149,   151,   157,    81,
-      87,    81,    85,   128,    87,   103,   101,    83,    83,   146,
-     102,    83,    87,   107,    81,    81,   165,    81,   125,   125,
-      81,   153,   157,    85,   125,   158,    80,    84,   113,    81,
-      87,    85,   101,   101,   162,    69,   103,   127,   103,   127,
-     103,   127,   127,   162,    83,    87,   154,   141,   128,   128,
-      83,    83,    81,    81,    85,    81,   153,    85,   125,   125,
-     127,   162,    80,   103,   127,   103,    81,    81,    81,    83,
-     160,    81,    81,    85,   127,    81,   127,   103,   103,   127,
-     162,   162,   162,    81,   162,    81,    81,   127,    81,   127,
-     103,    44,   103,   162,   162,    81,   162,    81,    81,   127,
-     162,   162,   162,   162,    81,   162
+      62,    64,    65,    66,    67,    68,    69,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,   130,   131,   134,
+     135,   136,   137,   143,   144,   148,   149,   160,   172,   173,
+     174,   176,   177,   178,   179,   180,   181,     3,    81,    90,
+     104,   108,   132,   133,   150,   151,   152,   131,   131,    83,
+     108,   109,   160,    83,   109,   131,   131,     0,   173,    81,
+       5,     6,     7,     8,     9,    10,    11,    31,    32,    46,
+      60,    81,    89,    90,    91,    92,    93,    94,   106,   107,
+     108,   110,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   129,   150,   148,   152,
+     153,    88,   104,    83,   103,   130,   131,   165,   175,    81,
+      85,   151,   135,   138,   139,   140,   148,    83,   145,   146,
+      83,   108,   156,    81,    81,    81,   112,   112,    81,    81,
+     112,    46,   112,   125,   126,   128,   140,   157,     9,    31,
+      32,    33,    81,    85,    87,   114,    90,    95,    96,    91,
+      92,    21,    22,    27,    28,    97,    98,    25,    26,    89,
+      99,   100,    29,    30,   101,    82,   148,   152,   133,   150,
+      36,    37,    40,    41,    42,    49,    50,    51,    57,    63,
+      70,    84,   104,   108,   109,   128,   130,   160,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,    83,   126,   161,
+     130,   165,    12,    82,   131,   154,   155,   156,    86,   126,
+     140,    84,   139,   102,   141,   142,   150,   140,   138,    84,
+      88,   108,   147,   145,    82,    88,   112,   112,    46,    83,
+     157,    81,   128,    13,    14,    15,    16,    17,    18,    19,
+      20,    23,    24,   103,   127,    82,    88,    81,    85,   152,
+     158,   159,    82,   109,    82,   111,   126,   128,   109,   114,
+     114,   114,   115,   115,   116,   116,   117,   117,   117,   117,
+     118,   118,   119,   120,   121,   122,   123,   128,   104,   129,
+     104,   102,   163,    81,   109,    81,   104,   128,    81,    81,
+     102,   104,    84,   167,   161,   162,    81,   150,   152,   158,
+      82,    88,    82,    86,   129,    88,   104,   102,    84,    84,
+     147,   103,    84,    88,   108,    82,    82,   166,    82,   126,
+     126,    82,   154,   158,    86,   126,   159,    81,    85,   114,
+      82,    88,    86,   102,   102,   163,    70,   104,   128,   104,
+     128,   104,   128,   128,   163,    84,    88,   155,   142,   129,
+     129,    84,    84,    82,    82,    86,    82,   154,    86,   126,
+     126,   128,   163,    81,   104,   128,   104,    82,    82,    82,
+      84,   161,    82,    82,    86,   128,    82,   128,   104,   104,
+     128,   163,   163,   163,    82,   163,    82,    82,   128,    82,
+     128,   104,    44,   104,   163,   163,    82,   163,    82,    82,
+     128,   163,   163,   163,   163,    82,   163
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,   104,   105,   105,   105,   105,   105,   105,   105,   105,
-     106,   106,   107,   108,   108,   109,   109,   109,   109,   109,
-     109,   109,   109,   110,   110,   111,   111,   111,   111,   111,
-     111,   111,   111,   112,   112,   112,   112,   112,   112,   113,
-     113,   114,   114,   114,   114,   115,   115,   115,   116,   116,
-     116,   117,   117,   117,   117,   117,   118,   118,   118,   119,
-     119,   120,   120,   121,   121,   122,   122,   123,   123,   124,
-     124,   125,   125,   126,   126,   126,   126,   126,   126,   126,
-     126,   126,   126,   126,   127,   127,   127,   128,   129,   129,
-     130,   130,   130,   130,   130,   130,   130,   130,   131,   131,
-     132,   132,   133,   133,   133,   133,   133,   134,   134,   134,
-     134,   134,   134,   134,   134,   134,   134,   134,   134,   134,
-     135,   135,   135,   136,   136,   137,   137,   138,   139,   139,
-     139,   139,   140,   140,   141,   141,   141,   141,   142,   142,
-     142,   142,   142,   143,   145,   144,   144,   146,   146,   147,
-     147,   147,   147,   148,   149,   149,   150,   150,   150,   150,
-     150,   150,   150,   151,   151,   151,   151,   152,   152,   153,
-     153,   154,   154,   154,   154,   155,   155,   156,   156,   157,
-     157,   157,   158,   158,   158,   158,   158,   158,   158,   158,
-     158,   159,   160,   160,   160,   161,   161,   162,   162,   162,
-     162,   162,   162,   163,   163,   163,   164,   164,   165,   165,
-     166,   166,   167,   167,   168,   168,   168,   169,   169,   169,
-     169,   169,   169,   169,   169,   169,   169,   170,   170,   170,
-     170,   170,   171,   171,   172,   172,   172,   173,   173,   174,
-     174,   175,   176,   177,   178,   179,   179,   179,   179,   179,
-     179,   179,   179,   180,   180,   180,   180
+       0,   105,   106,   106,   106,   106,   106,   106,   106,   106,
+     107,   107,   108,   109,   109,   110,   110,   110,   110,   110,
+     110,   110,   110,   111,   111,   112,   112,   112,   112,   112,
+     112,   112,   112,   113,   113,   113,   113,   113,   113,   114,
+     114,   115,   115,   115,   115,   116,   116,   116,   117,   117,
+     117,   118,   118,   118,   118,   118,   119,   119,   119,   120,
+     120,   121,   121,   122,   122,   123,   123,   124,   124,   125,
+     125,   126,   126,   127,   127,   127,   127,   127,   127,   127,
+     127,   127,   127,   127,   128,   128,   128,   129,   130,   130,
+     131,   131,   131,   131,   131,   131,   131,   131,   132,   132,
+     133,   133,   134,   134,   134,   134,   134,   134,   135,   135,
+     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
+     135,   136,   136,   136,   137,   137,   138,   138,   139,   140,
+     140,   140,   140,   141,   141,   142,   142,   142,   142,   143,
+     143,   143,   143,   143,   144,   146,   145,   145,   147,   147,
+     148,   148,   148,   148,   149,   150,   150,   151,   151,   151,
+     151,   151,   151,   151,   152,   152,   152,   152,   153,   153,
+     154,   154,   155,   155,   155,   155,   156,   156,   157,   157,
+     158,   158,   158,   159,   159,   159,   159,   159,   159,   159,
+     159,   159,   160,   161,   161,   161,   162,   162,   163,   163,
+     163,   163,   163,   163,   164,   164,   164,   165,   165,   166,
+     166,   167,   167,   168,   168,   169,   169,   169,   170,   170,
+     170,   170,   170,   170,   170,   170,   170,   170,   171,   171,
+     171,   171,   171,   172,   172,   173,   173,   173,   174,   174,
+     175,   175,   176,   177,   178,   179,   180,   180,   180,   180,
+     180,   180,   180,   180,   181,   181,   181,   181
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1671,20 +1660,20 @@ static const yytype_uint8 yyr2[] =
        2,     1,     2,     1,     2,     1,     2,     1,     1,     3,
        1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       5,     4,     2,     1,     1,     1,     2,     3,     2,     1,
-       2,     1,     1,     3,     0,     1,     2,     3,     5,     4,
-       6,     5,     2,     1,     0,     2,     3,     1,     3,     1,
-       1,     1,     1,     1,     2,     1,     1,     3,     4,     3,
-       4,     4,     3,     2,     1,     3,     2,     1,     2,     1,
-       3,     2,     2,     1,     1,     1,     3,     1,     2,     1,
-       1,     2,     3,     2,     3,     3,     4,     2,     3,     3,
-       4,     1,     1,     3,     4,     1,     3,     1,     1,     1,
-       1,     1,     1,     3,     4,     3,     2,     3,     1,     2,
-       1,     1,     1,     2,     5,     7,     5,     5,     7,     6,
-       7,     7,     8,     7,     8,     8,     9,     3,     2,     2,
-       2,     3,     1,     2,     1,     1,     1,     4,     3,     1,
-       2,     1,     1,     4,     2,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1
+       1,     5,     4,     2,     1,     1,     1,     2,     3,     2,
+       1,     2,     1,     1,     3,     0,     1,     2,     3,     5,
+       4,     6,     5,     2,     1,     0,     2,     3,     1,     3,
+       1,     1,     1,     1,     1,     2,     1,     1,     3,     4,
+       3,     4,     4,     3,     2,     1,     3,     2,     1,     2,
+       1,     3,     2,     2,     1,     1,     1,     3,     1,     2,
+       1,     1,     2,     3,     2,     3,     3,     4,     2,     3,
+       3,     4,     1,     1,     3,     4,     1,     3,     1,     1,
+       1,     1,     1,     1,     3,     4,     3,     2,     3,     1,
+       2,     1,     1,     1,     2,     5,     7,     5,     5,     7,
+       6,     7,     7,     8,     7,     8,     8,     9,     3,     2,
+       2,     2,     3,     1,     2,     1,     1,     1,     4,     3,
+       1,     2,     1,     1,     4,     2,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1
 };
 
 
@@ -2363,20 +2352,20 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 305 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 327 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-               (yyval.symbol) = g_hash_table_lookup (const_table, (yyvsp[0].str));
+               (yyval.symbol) = g_hash_table_lookup (scanner->const_table, (yyvsp[0].str));
                if ((yyval.symbol) == NULL) {
                        (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
                } else {
                        (yyval.symbol) = gi_source_symbol_ref ((yyval.symbol));
                }
          }
-#line 2376 "scannerparser.c" /* yacc.c:1646  */
+#line 2365 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 3:
-#line 314 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 336 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                char *rest;
                guint64 value;
@@ -2392,58 +2381,58 @@ yyreduce:
                (yyval.symbol)->const_int = value;
                (yyval.symbol)->const_int_is_unsigned = (rest && (rest[0] == 'U'));
          }
-#line 2396 "scannerparser.c" /* yacc.c:1646  */
+#line 2385 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 4:
-#line 330 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 352 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_boolean_set = TRUE;
                (yyval.symbol)->const_boolean = g_ascii_strcasecmp (yytext, "true") == 0 ? TRUE : FALSE;
          }
-#line 2406 "scannerparser.c" /* yacc.c:1646  */
+#line 2395 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 5:
-#line 336 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 358 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = g_utf8_get_char(yytext + 1);
          }
-#line 2416 "scannerparser.c" /* yacc.c:1646  */
+#line 2405 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 342 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 364 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_double_set = TRUE;
                (yyval.symbol)->const_double = 0.0;
         sscanf (yytext, "%lf", &((yyval.symbol)->const_double));
          }
-#line 2427 "scannerparser.c" /* yacc.c:1646  */
+#line 2416 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 350 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 372 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[-1].symbol);
          }
-#line 2435 "scannerparser.c" /* yacc.c:1646  */
+#line 2424 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 354 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 376 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 2443 "scannerparser.c" /* yacc.c:1646  */
+#line 2432 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 362 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 384 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                yytext[strlen (yytext) - 1] = '\0';
@@ -2458,11 +2447,11 @@ yyreduce:
                   }
 
          }
-#line 2462 "scannerparser.c" /* yacc.c:1646  */
+#line 2451 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 377 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 399 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                char *strings, *string2;
                (yyval.symbol) = (yyvsp[-1].symbol);
@@ -2473,91 +2462,91 @@ yyreduce:
                g_free (string2);
                (yyval.symbol)->const_string = strings;
          }
-#line 2477 "scannerparser.c" /* yacc.c:1646  */
+#line 2466 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 391 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 413 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.str) = g_strdup (yytext);
          }
-#line 2485 "scannerparser.c" /* yacc.c:1646  */
+#line 2474 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 404 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 426 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 2493 "scannerparser.c" /* yacc.c:1646  */
+#line 2482 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 408 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 430 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 2501 "scannerparser.c" /* yacc.c:1646  */
+#line 2490 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 412 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 434 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 2509 "scannerparser.c" /* yacc.c:1646  */
+#line 2498 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 416 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 438 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 2517 "scannerparser.c" /* yacc.c:1646  */
+#line 2506 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 420 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 442 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 2525 "scannerparser.c" /* yacc.c:1646  */
+#line 2514 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 21:
-#line 424 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 446 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 2533 "scannerparser.c" /* yacc.c:1646  */
+#line 2522 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 22:
-#line 428 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 450 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 2541 "scannerparser.c" /* yacc.c:1646  */
+#line 2530 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 26:
-#line 441 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 463 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 2549 "scannerparser.c" /* yacc.c:1646  */
+#line 2538 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 27:
-#line 445 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 467 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 2557 "scannerparser.c" /* yacc.c:1646  */
+#line 2546 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 28:
-#line 449 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 471 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                switch ((yyvsp[-1].unary_operator)) {
                case UNARY_PLUS:
@@ -2580,98 +2569,98 @@ yyreduce:
                        break;
                }
          }
-#line 2584 "scannerparser.c" /* yacc.c:1646  */
+#line 2573 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 29:
-#line 472 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 494 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[-1].symbol);
                if ((yyval.symbol)->const_int_set) {
                        (yyval.symbol)->base_type = gi_source_basic_type_new ((yyval.symbol)->const_int_is_unsigned ? "guint64" : "gint64");
                }
          }
-#line 2595 "scannerparser.c" /* yacc.c:1646  */
+#line 2584 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 30:
-#line 479 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 501 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[-1].symbol);
                if ((yyval.symbol)->const_int_set) {
                        (yyval.symbol)->base_type = gi_source_basic_type_new ("guint64");
                }
          }
-#line 2606 "scannerparser.c" /* yacc.c:1646  */
+#line 2595 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 31:
-#line 486 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 508 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 2614 "scannerparser.c" /* yacc.c:1646  */
+#line 2603 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 32:
-#line 490 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 512 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                ctype_free ((yyvsp[-1].ctype));
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 2623 "scannerparser.c" /* yacc.c:1646  */
+#line 2612 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 33:
-#line 498 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 520 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.unary_operator) = UNARY_ADDRESS_OF;
          }
-#line 2631 "scannerparser.c" /* yacc.c:1646  */
+#line 2620 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 34:
-#line 502 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 524 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.unary_operator) = UNARY_POINTER_INDIRECTION;
          }
-#line 2639 "scannerparser.c" /* yacc.c:1646  */
+#line 2628 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 35:
-#line 506 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 528 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.unary_operator) = UNARY_PLUS;
          }
-#line 2647 "scannerparser.c" /* yacc.c:1646  */
+#line 2636 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 36:
-#line 510 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 532 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.unary_operator) = UNARY_MINUS;
          }
-#line 2655 "scannerparser.c" /* yacc.c:1646  */
+#line 2644 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 37:
-#line 514 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 536 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.unary_operator) = UNARY_BITWISE_COMPLEMENT;
          }
-#line 2663 "scannerparser.c" /* yacc.c:1646  */
+#line 2652 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 38:
-#line 518 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 540 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.unary_operator) = UNARY_LOGICAL_NEGATION;
          }
-#line 2671 "scannerparser.c" /* yacc.c:1646  */
+#line 2660 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 40:
-#line 526 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 548 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[0].symbol);
                if ((yyval.symbol)->const_int_set || (yyval.symbol)->const_double_set || (yyval.symbol)->const_string != NULL) {
@@ -2680,21 +2669,21 @@ yyreduce:
                        ctype_free ((yyvsp[-2].ctype));
                }
          }
-#line 2684 "scannerparser.c" /* yacc.c:1646  */
+#line 2673 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 42:
-#line 539 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 561 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int * (yyvsp[0].symbol)->const_int;
          }
-#line 2694 "scannerparser.c" /* yacc.c:1646  */
+#line 2683 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 43:
-#line 545 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 567 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
@@ -2702,11 +2691,11 @@ yyreduce:
                        (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int / (yyvsp[0].symbol)->const_int;
                }
          }
-#line 2706 "scannerparser.c" /* yacc.c:1646  */
+#line 2695 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 44:
-#line 553 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 575 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
@@ -2714,31 +2703,31 @@ yyreduce:
                        (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int % (yyvsp[0].symbol)->const_int;
                }
          }
-#line 2718 "scannerparser.c" /* yacc.c:1646  */
+#line 2707 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 46:
-#line 565 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 587 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int + (yyvsp[0].symbol)->const_int;
          }
-#line 2728 "scannerparser.c" /* yacc.c:1646  */
+#line 2717 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 571 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 593 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int - (yyvsp[0].symbol)->const_int;
          }
-#line 2738 "scannerparser.c" /* yacc.c:1646  */
+#line 2727 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 49:
-#line 581 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 603 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
@@ -2750,111 +2739,111 @@ yyreduce:
                 */
                is_bitfield = TRUE;
          }
-#line 2754 "scannerparser.c" /* yacc.c:1646  */
+#line 2743 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 50:
-#line 593 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 615 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int >> (yyvsp[0].symbol)->const_int;
          }
-#line 2764 "scannerparser.c" /* yacc.c:1646  */
+#line 2753 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 52:
-#line 603 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 625 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int < (yyvsp[0].symbol)->const_int;
          }
-#line 2774 "scannerparser.c" /* yacc.c:1646  */
+#line 2763 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 53:
-#line 609 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 631 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int > (yyvsp[0].symbol)->const_int;
          }
-#line 2784 "scannerparser.c" /* yacc.c:1646  */
+#line 2773 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 54:
-#line 615 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 637 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int <= (yyvsp[0].symbol)->const_int;
          }
-#line 2794 "scannerparser.c" /* yacc.c:1646  */
+#line 2783 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 55:
-#line 621 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 643 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int >= (yyvsp[0].symbol)->const_int;
          }
-#line 2804 "scannerparser.c" /* yacc.c:1646  */
+#line 2793 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 57:
-#line 631 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 653 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int == (yyvsp[0].symbol)->const_int;
          }
-#line 2814 "scannerparser.c" /* yacc.c:1646  */
+#line 2803 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 58:
-#line 637 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 659 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int != (yyvsp[0].symbol)->const_int;
          }
-#line 2824 "scannerparser.c" /* yacc.c:1646  */
+#line 2813 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 60:
-#line 647 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 669 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int & (yyvsp[0].symbol)->const_int;
          }
-#line 2834 "scannerparser.c" /* yacc.c:1646  */
+#line 2823 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 62:
-#line 657 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 679 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int ^ (yyvsp[0].symbol)->const_int;
          }
-#line 2844 "scannerparser.c" /* yacc.c:1646  */
+#line 2833 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 64:
-#line 667 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 689 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int | (yyvsp[0].symbol)->const_int;
          }
-#line 2854 "scannerparser.c" /* yacc.c:1646  */
+#line 2843 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 66:
-#line 677 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 699 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
@@ -2862,11 +2851,11 @@ yyreduce:
                  gi_source_symbol_get_const_boolean ((yyvsp[-2].symbol)) &&
                  gi_source_symbol_get_const_boolean ((yyvsp[0].symbol));
          }
-#line 2866 "scannerparser.c" /* yacc.c:1646  */
+#line 2855 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 68:
-#line 689 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 711 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
                (yyval.symbol)->const_int_set = TRUE;
@@ -2874,35 +2863,35 @@ yyreduce:
                  gi_source_symbol_get_const_boolean ((yyvsp[-2].symbol)) ||
                  gi_source_symbol_get_const_boolean ((yyvsp[0].symbol));
          }
-#line 2878 "scannerparser.c" /* yacc.c:1646  */
+#line 2867 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 70:
-#line 701 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 723 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_get_const_boolean ((yyvsp[-4].symbol)) ? (yyvsp[-2].symbol) : (yyvsp[0].symbol);
          }
-#line 2886 "scannerparser.c" /* yacc.c:1646  */
+#line 2875 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 72:
-#line 709 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 731 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 2894 "scannerparser.c" /* yacc.c:1646  */
+#line 2883 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 86:
-#line 732 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 754 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 2902 "scannerparser.c" /* yacc.c:1646  */
+#line 2891 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 88:
-#line 745 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 767 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                GList *l;
                for (l = (yyvsp[-1].list); l != NULL; l = l->next) {
@@ -2920,37 +2909,37 @@ yyreduce:
                }
                ctype_free ((yyvsp[-2].ctype));
          }
-#line 2924 "scannerparser.c" /* yacc.c:1646  */
+#line 2913 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 89:
-#line 763 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 785 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                ctype_free ((yyvsp[-1].ctype));
          }
-#line 2932 "scannerparser.c" /* yacc.c:1646  */
+#line 2921 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 90:
-#line 770 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 792 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = (yyvsp[0].ctype);
                (yyval.ctype)->storage_class_specifier |= (yyvsp[-1].storage_class_specifier);
          }
-#line 2941 "scannerparser.c" /* yacc.c:1646  */
+#line 2930 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 91:
-#line 775 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 797 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = gi_source_type_new (CTYPE_INVALID);
                (yyval.ctype)->storage_class_specifier |= (yyvsp[0].storage_class_specifier);
          }
-#line 2950 "scannerparser.c" /* yacc.c:1646  */
+#line 2939 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 92:
-#line 780 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 802 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = (yyvsp[-1].ctype);
                /* combine basic types like unsigned int and long long */
@@ -2960,195 +2949,203 @@ yyreduce:
                        (yyval.ctype)->name = name;
                        ctype_free ((yyvsp[0].ctype));
                } else {
-                       (yyval.ctype)->base_type = (yyvsp[0].ctype);
+                       set_or_merge_base_type ((yyvsp[-1].ctype), (yyvsp[0].ctype));
                }
          }
-#line 2967 "scannerparser.c" /* yacc.c:1646  */
+#line 2956 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 94:
-#line 794 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 816 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = (yyvsp[0].ctype);
                (yyval.ctype)->type_qualifier |= (yyvsp[-1].type_qualifier);
          }
-#line 2976 "scannerparser.c" /* yacc.c:1646  */
+#line 2965 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 95:
-#line 799 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 821 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = gi_source_type_new (CTYPE_INVALID);
                (yyval.ctype)->type_qualifier |= (yyvsp[0].type_qualifier);
          }
-#line 2985 "scannerparser.c" /* yacc.c:1646  */
+#line 2974 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 96:
-#line 804 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 826 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = (yyvsp[0].ctype);
                (yyval.ctype)->function_specifier |= (yyvsp[-1].function_specifier);
          }
-#line 2994 "scannerparser.c" /* yacc.c:1646  */
+#line 2983 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 97:
-#line 809 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 831 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = gi_source_type_new (CTYPE_INVALID);
                (yyval.ctype)->function_specifier |= (yyvsp[0].function_specifier);
          }
-#line 3003 "scannerparser.c" /* yacc.c:1646  */
+#line 2992 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 98:
-#line 817 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 839 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.list) = g_list_append (NULL, (yyvsp[0].symbol));
          }
-#line 3011 "scannerparser.c" /* yacc.c:1646  */
+#line 3000 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 99:
-#line 821 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 843 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.list) = g_list_append ((yyvsp[-2].list), (yyvsp[0].symbol));
          }
-#line 3019 "scannerparser.c" /* yacc.c:1646  */
+#line 3008 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 102:
-#line 833 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 855 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.storage_class_specifier) = STORAGE_CLASS_TYPEDEF;
          }
-#line 3027 "scannerparser.c" /* yacc.c:1646  */
+#line 3016 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 103:
-#line 837 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 859 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.storage_class_specifier) = STORAGE_CLASS_EXTERN;
          }
-#line 3035 "scannerparser.c" /* yacc.c:1646  */
+#line 3024 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 104:
-#line 841 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 863 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.storage_class_specifier) = STORAGE_CLASS_STATIC;
          }
-#line 3043 "scannerparser.c" /* yacc.c:1646  */
+#line 3032 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 105:
-#line 845 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 867 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.storage_class_specifier) = STORAGE_CLASS_AUTO;
          }
-#line 3051 "scannerparser.c" /* yacc.c:1646  */
+#line 3040 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 106:
-#line 849 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 871 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.storage_class_specifier) = STORAGE_CLASS_REGISTER;
          }
-#line 3059 "scannerparser.c" /* yacc.c:1646  */
+#line 3048 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 107:
-#line 856 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 875 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-               (yyval.ctype) = gi_source_type_new (CTYPE_VOID);
+               (yyval.storage_class_specifier) = STORAGE_CLASS_THREAD_LOCAL;
          }
-#line 3067 "scannerparser.c" /* yacc.c:1646  */
+#line 3056 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 108:
-#line 860 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 882 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-               (yyval.ctype) = gi_source_basic_type_new ("char");
+               (yyval.ctype) = gi_source_type_new (CTYPE_VOID);
          }
-#line 3075 "scannerparser.c" /* yacc.c:1646  */
+#line 3064 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 109:
-#line 864 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 886 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-               (yyval.ctype) = gi_source_basic_type_new ("short");
+               (yyval.ctype) = gi_source_basic_type_new ("char");
          }
-#line 3083 "scannerparser.c" /* yacc.c:1646  */
+#line 3072 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 110:
-#line 868 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 890 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-               (yyval.ctype) = gi_source_basic_type_new ("int");
+               (yyval.ctype) = gi_source_basic_type_new ("short");
          }
-#line 3091 "scannerparser.c" /* yacc.c:1646  */
+#line 3080 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 111:
-#line 872 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 894 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-               (yyval.ctype) = gi_source_basic_type_new ("long");
+               (yyval.ctype) = gi_source_basic_type_new ("int");
          }
-#line 3099 "scannerparser.c" /* yacc.c:1646  */
+#line 3088 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 112:
-#line 876 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 898 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-               (yyval.ctype) = gi_source_basic_type_new ("float");
+               (yyval.ctype) = gi_source_basic_type_new ("long");
          }
-#line 3107 "scannerparser.c" /* yacc.c:1646  */
+#line 3096 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 113:
-#line 880 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 902 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-               (yyval.ctype) = gi_source_basic_type_new ("double");
+               (yyval.ctype) = gi_source_basic_type_new ("float");
          }
-#line 3115 "scannerparser.c" /* yacc.c:1646  */
+#line 3104 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 114:
-#line 884 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 906 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-               (yyval.ctype) = gi_source_basic_type_new ("signed");
+               (yyval.ctype) = gi_source_basic_type_new ("double");
          }
-#line 3123 "scannerparser.c" /* yacc.c:1646  */
+#line 3112 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 115:
-#line 888 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 910 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-               (yyval.ctype) = gi_source_basic_type_new ("unsigned");
+               (yyval.ctype) = gi_source_basic_type_new ("signed");
          }
-#line 3131 "scannerparser.c" /* yacc.c:1646  */
+#line 3120 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 116:
-#line 892 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 914 "giscanner/scannerparser.y" /* yacc.c:1646  */
+    {
+               (yyval.ctype) = gi_source_basic_type_new ("unsigned");
+         }
+#line 3128 "giscanner/scannerparser.c" /* yacc.c:1646  */
+    break;
+
+  case 117:
+#line 918 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = gi_source_basic_type_new ("bool");
          }
-#line 3139 "scannerparser.c" /* yacc.c:1646  */
+#line 3136 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 119:
-#line 898 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 120:
+#line 924 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = gi_source_typedef_new ((yyvsp[0].str));
                g_free ((yyvsp[0].str));
          }
-#line 3148 "scannerparser.c" /* yacc.c:1646  */
+#line 3145 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 120:
-#line 906 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 121:
+#line 932 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                GISourceSymbol *sym;
                (yyval.ctype) = (yyvsp[-4].ctype);
@@ -3168,55 +3165,55 @@ yyreduce:
                gi_source_scanner_add_symbol (scanner, sym);
                gi_source_symbol_unref (sym);
          }
-#line 3172 "scannerparser.c" /* yacc.c:1646  */
+#line 3169 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 121:
-#line 926 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 122:
+#line 952 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = (yyvsp[-3].ctype);
                (yyval.ctype)->child_list = (yyvsp[-1].list);
          }
-#line 3181 "scannerparser.c" /* yacc.c:1646  */
+#line 3178 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 122:
-#line 931 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 123:
+#line 957 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = (yyvsp[-1].ctype);
                (yyval.ctype)->name = (yyvsp[0].str);
          }
-#line 3190 "scannerparser.c" /* yacc.c:1646  */
+#line 3187 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 123:
-#line 939 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 124:
+#line 965 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                 scanner->private = FALSE;
                (yyval.ctype) = gi_source_struct_new (NULL);
          }
-#line 3199 "scannerparser.c" /* yacc.c:1646  */
+#line 3196 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 124:
-#line 944 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 125:
+#line 970 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                 scanner->private = FALSE;
                (yyval.ctype) = gi_source_union_new (NULL);
          }
-#line 3208 "scannerparser.c" /* yacc.c:1646  */
+#line 3205 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 126:
-#line 953 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 127:
+#line 979 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.list) = g_list_concat ((yyvsp[-1].list), (yyvsp[0].list));
          }
-#line 3216 "scannerparser.c" /* yacc.c:1646  */
+#line 3213 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 127:
-#line 960 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 128:
+#line 986 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
            GList *l;
            (yyval.list) = NULL;
@@ -3233,70 +3230,70 @@ yyreduce:
              }
            ctype_free ((yyvsp[-2].ctype));
          }
-#line 3237 "scannerparser.c" /* yacc.c:1646  */
+#line 3234 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 128:
-#line 980 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 129:
+#line 1006 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = (yyvsp[-1].ctype);
-               (yyval.ctype)->base_type = (yyvsp[0].ctype);
+               set_or_merge_base_type ((yyvsp[-1].ctype), (yyvsp[0].ctype));
          }
-#line 3246 "scannerparser.c" /* yacc.c:1646  */
+#line 3243 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 130:
-#line 986 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 131:
+#line 1012 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = (yyvsp[0].ctype);
                (yyval.ctype)->type_qualifier |= (yyvsp[-1].type_qualifier);
          }
-#line 3255 "scannerparser.c" /* yacc.c:1646  */
+#line 3252 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 131:
-#line 991 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 132:
+#line 1017 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = gi_source_type_new (CTYPE_INVALID);
                (yyval.ctype)->type_qualifier |= (yyvsp[0].type_qualifier);
          }
-#line 3264 "scannerparser.c" /* yacc.c:1646  */
+#line 3261 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 132:
-#line 999 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 133:
+#line 1025 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.list) = g_list_append (NULL, (yyvsp[0].symbol));
          }
-#line 3272 "scannerparser.c" /* yacc.c:1646  */
+#line 3269 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 133:
-#line 1003 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 134:
+#line 1029 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.list) = g_list_append ((yyvsp[-2].list), (yyvsp[0].symbol));
          }
-#line 3280 "scannerparser.c" /* yacc.c:1646  */
+#line 3277 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 134:
-#line 1010 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 135:
+#line 1036 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 3288 "scannerparser.c" /* yacc.c:1646  */
+#line 3285 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 136:
-#line 1015 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 137:
+#line 1041 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
          }
-#line 3296 "scannerparser.c" /* yacc.c:1646  */
+#line 3293 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 137:
-#line 1019 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 138:
+#line 1045 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[-2].symbol);
                if ((yyvsp[0].symbol)->const_int_set) {
@@ -3304,208 +3301,208 @@ yyreduce:
                  (yyval.symbol)->const_int = (yyvsp[0].symbol)->const_int;
                }
          }
-#line 3308 "scannerparser.c" /* yacc.c:1646  */
+#line 3305 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 138:
-#line 1030 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 139:
+#line 1056 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = gi_source_enum_new ((yyvsp[-3].str));
                (yyval.ctype)->child_list = (yyvsp[-1].list);
                (yyval.ctype)->is_bitfield = is_bitfield || scanner->flags;
                last_enum_value = -1;
          }
-#line 3319 "scannerparser.c" /* yacc.c:1646  */
+#line 3316 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 139:
-#line 1037 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 140:
+#line 1063 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = gi_source_enum_new (NULL);
                (yyval.ctype)->child_list = (yyvsp[-1].list);
                (yyval.ctype)->is_bitfield = is_bitfield || scanner->flags;
                last_enum_value = -1;
          }
-#line 3330 "scannerparser.c" /* yacc.c:1646  */
+#line 3327 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 140:
-#line 1044 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 141:
+#line 1070 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = gi_source_enum_new ((yyvsp[-4].str));
                (yyval.ctype)->child_list = (yyvsp[-2].list);
                (yyval.ctype)->is_bitfield = is_bitfield || scanner->flags;
                last_enum_value = -1;
          }
-#line 3341 "scannerparser.c" /* yacc.c:1646  */
+#line 3338 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 141:
-#line 1051 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 142:
+#line 1077 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = gi_source_enum_new (NULL);
                (yyval.ctype)->child_list = (yyvsp[-2].list);
                (yyval.ctype)->is_bitfield = is_bitfield || scanner->flags;
                last_enum_value = -1;
          }
-#line 3352 "scannerparser.c" /* yacc.c:1646  */
+#line 3349 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 142:
-#line 1058 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 143:
+#line 1084 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = gi_source_enum_new ((yyvsp[0].str));
          }
-#line 3360 "scannerparser.c" /* yacc.c:1646  */
+#line 3357 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 143:
-#line 1065 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 144:
+#line 1091 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                 scanner->flags = FALSE;
                 scanner->private = FALSE;
           }
-#line 3369 "scannerparser.c" /* yacc.c:1646  */
+#line 3366 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 144:
-#line 1073 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 145:
+#line 1099 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                /* reset flag before the first enum value */
                is_bitfield = FALSE;
          }
-#line 3378 "scannerparser.c" /* yacc.c:1646  */
+#line 3375 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 145:
-#line 1078 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 146:
+#line 1104 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
             (yyvsp[0].symbol)->private = scanner->private;
             (yyval.list) = g_list_append (NULL, (yyvsp[0].symbol));
          }
-#line 3387 "scannerparser.c" /* yacc.c:1646  */
+#line 3384 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 146:
-#line 1083 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 147:
+#line 1109 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
             (yyvsp[0].symbol)->private = scanner->private;
             (yyval.list) = g_list_append ((yyvsp[-2].list), (yyvsp[0].symbol));
          }
-#line 3396 "scannerparser.c" /* yacc.c:1646  */
+#line 3393 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 147:
-#line 1091 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 148:
+#line 1117 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_OBJECT, scanner->current_file, lineno);
                (yyval.symbol)->ident = (yyvsp[0].str);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = ++last_enum_value;
-               g_hash_table_insert (const_table, g_strdup ((yyval.symbol)->ident), gi_source_symbol_ref ((yyval.symbol)));
+               g_hash_table_insert (scanner->const_table, g_strdup ((yyval.symbol)->ident), gi_source_symbol_ref ((yyval.symbol)));
          }
-#line 3408 "scannerparser.c" /* yacc.c:1646  */
+#line 3405 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 148:
-#line 1099 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 149:
+#line 1125 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_OBJECT, scanner->current_file, lineno);
                (yyval.symbol)->ident = (yyvsp[-2].str);
                (yyval.symbol)->const_int_set = TRUE;
                (yyval.symbol)->const_int = (yyvsp[0].symbol)->const_int;
                last_enum_value = (yyval.symbol)->const_int;
-               g_hash_table_insert (const_table, g_strdup ((yyval.symbol)->ident), gi_source_symbol_ref ((yyval.symbol)));
+               g_hash_table_insert (scanner->const_table, g_strdup ((yyval.symbol)->ident), gi_source_symbol_ref ((yyval.symbol)));
          }
-#line 3421 "scannerparser.c" /* yacc.c:1646  */
+#line 3418 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 149:
-#line 1111 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 150:
+#line 1137 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.type_qualifier) = TYPE_QUALIFIER_CONST;
          }
-#line 3429 "scannerparser.c" /* yacc.c:1646  */
+#line 3426 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 150:
-#line 1115 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 151:
+#line 1141 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.type_qualifier) = TYPE_QUALIFIER_RESTRICT;
          }
-#line 3437 "scannerparser.c" /* yacc.c:1646  */
+#line 3434 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 151:
-#line 1119 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 152:
+#line 1145 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.type_qualifier) = TYPE_QUALIFIER_EXTENSION;
          }
-#line 3445 "scannerparser.c" /* yacc.c:1646  */
+#line 3442 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 152:
-#line 1123 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 153:
+#line 1149 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.type_qualifier) = TYPE_QUALIFIER_VOLATILE;
          }
-#line 3453 "scannerparser.c" /* yacc.c:1646  */
+#line 3450 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 153:
-#line 1130 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 154:
+#line 1156 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.function_specifier) = FUNCTION_INLINE;
          }
-#line 3461 "scannerparser.c" /* yacc.c:1646  */
+#line 3458 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 154:
-#line 1137 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 155:
+#line 1163 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[0].symbol);
                gi_source_symbol_merge_type ((yyval.symbol), (yyvsp[-1].ctype));
          }
-#line 3470 "scannerparser.c" /* yacc.c:1646  */
+#line 3467 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 156:
-#line 1146 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 157:
+#line 1172 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
                (yyval.symbol)->ident = (yyvsp[0].str);
          }
-#line 3479 "scannerparser.c" /* yacc.c:1646  */
+#line 3476 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 157:
-#line 1151 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 158:
+#line 1177 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[-1].symbol);
          }
-#line 3487 "scannerparser.c" /* yacc.c:1646  */
+#line 3484 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 158:
-#line 1155 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 159:
+#line 1181 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[-3].symbol);
                gi_source_symbol_merge_type ((yyval.symbol), gi_source_array_new ((yyvsp[-1].symbol)));
          }
-#line 3496 "scannerparser.c" /* yacc.c:1646  */
+#line 3493 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 159:
-#line 1160 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 160:
+#line 1186 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[-2].symbol);
                gi_source_symbol_merge_type ((yyval.symbol), gi_source_array_new (NULL));
          }
-#line 3505 "scannerparser.c" /* yacc.c:1646  */
+#line 3502 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 160:
-#line 1165 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 161:
+#line 1191 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                GISourceType *func = gi_source_function_new ();
                // ignore (void) parameter list
@@ -3515,49 +3512,49 @@ yyreduce:
                (yyval.symbol) = (yyvsp[-3].symbol);
                gi_source_symbol_merge_type ((yyval.symbol), func);
          }
-#line 3519 "scannerparser.c" /* yacc.c:1646  */
+#line 3516 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 161:
-#line 1175 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 162:
+#line 1201 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                GISourceType *func = gi_source_function_new ();
                func->child_list = (yyvsp[-1].list);
                (yyval.symbol) = (yyvsp[-3].symbol);
                gi_source_symbol_merge_type ((yyval.symbol), func);
          }
-#line 3530 "scannerparser.c" /* yacc.c:1646  */
+#line 3527 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 162:
-#line 1182 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 163:
+#line 1208 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                GISourceType *func = gi_source_function_new ();
                (yyval.symbol) = (yyvsp[-2].symbol);
                gi_source_symbol_merge_type ((yyval.symbol), func);
          }
-#line 3540 "scannerparser.c" /* yacc.c:1646  */
+#line 3537 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 163:
-#line 1191 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 164:
+#line 1217 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = gi_source_pointer_new (NULL);
                (yyval.ctype)->type_qualifier = (yyvsp[0].type_qualifier);
          }
-#line 3549 "scannerparser.c" /* yacc.c:1646  */
+#line 3546 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 164:
-#line 1196 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 165:
+#line 1222 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.ctype) = gi_source_pointer_new (NULL);
          }
-#line 3557 "scannerparser.c" /* yacc.c:1646  */
+#line 3554 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 165:
-#line 1200 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 166:
+#line 1226 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                GISourceType **base = &((yyvsp[0].ctype)->base_type);
 
@@ -3568,11 +3565,11 @@ yyreduce:
                (*base)->type_qualifier = (yyvsp[-1].type_qualifier);
                (yyval.ctype) = (yyvsp[0].ctype);
          }
-#line 3572 "scannerparser.c" /* yacc.c:1646  */
+#line 3569 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 166:
-#line 1211 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 167:
+#line 1237 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                GISourceType **base = &((yyvsp[0].ctype)->base_type);
 
@@ -3582,162 +3579,162 @@ yyreduce:
                *base = gi_source_pointer_new (NULL);
                (yyval.ctype) = (yyvsp[0].ctype);
          }
-#line 3586 "scannerparser.c" /* yacc.c:1646  */
+#line 3583 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 168:
-#line 1225 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 169:
+#line 1251 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.type_qualifier) = (yyvsp[-1].type_qualifier) | (yyvsp[0].type_qualifier);
          }
-#line 3594 "scannerparser.c" /* yacc.c:1646  */
+#line 3591 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 169:
-#line 1232 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 170:
+#line 1258 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.list) = g_list_append (NULL, (yyvsp[0].symbol));
          }
-#line 3602 "scannerparser.c" /* yacc.c:1646  */
+#line 3599 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 170:
-#line 1236 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 171:
+#line 1262 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.list) = g_list_append ((yyvsp[-2].list), (yyvsp[0].symbol));
          }
-#line 3610 "scannerparser.c" /* yacc.c:1646  */
+#line 3607 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 171:
-#line 1243 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 172:
+#line 1269 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[0].symbol);
                gi_source_symbol_merge_type ((yyval.symbol), (yyvsp[-1].ctype));
          }
-#line 3619 "scannerparser.c" /* yacc.c:1646  */
+#line 3616 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 172:
-#line 1248 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 173:
+#line 1274 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[0].symbol);
                gi_source_symbol_merge_type ((yyval.symbol), (yyvsp[-1].ctype));
          }
-#line 3628 "scannerparser.c" /* yacc.c:1646  */
+#line 3625 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 173:
-#line 1253 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 174:
+#line 1279 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
                (yyval.symbol)->base_type = (yyvsp[0].ctype);
          }
-#line 3637 "scannerparser.c" /* yacc.c:1646  */
+#line 3634 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 174:
-#line 1258 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 175:
+#line 1284 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_ELLIPSIS, scanner->current_file, lineno);
          }
-#line 3645 "scannerparser.c" /* yacc.c:1646  */
+#line 3642 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 175:
-#line 1265 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 176:
+#line 1291 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                GISourceSymbol *sym = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
                sym->ident = (yyvsp[0].str);
                (yyval.list) = g_list_append (NULL, sym);
          }
-#line 3655 "scannerparser.c" /* yacc.c:1646  */
+#line 3652 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 176:
-#line 1271 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 177:
+#line 1297 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                GISourceSymbol *sym = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
                sym->ident = (yyvsp[0].str);
                (yyval.list) = g_list_append ((yyvsp[-2].list), sym);
          }
-#line 3665 "scannerparser.c" /* yacc.c:1646  */
+#line 3662 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 179:
-#line 1285 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 180:
+#line 1311 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
                gi_source_symbol_merge_type ((yyval.symbol), (yyvsp[0].ctype));
          }
-#line 3674 "scannerparser.c" /* yacc.c:1646  */
+#line 3671 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 181:
-#line 1291 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 182:
+#line 1317 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[0].symbol);
                gi_source_symbol_merge_type ((yyval.symbol), (yyvsp[-1].ctype));
          }
-#line 3683 "scannerparser.c" /* yacc.c:1646  */
+#line 3680 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 182:
-#line 1299 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 183:
+#line 1325 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[-1].symbol);
          }
-#line 3691 "scannerparser.c" /* yacc.c:1646  */
+#line 3688 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 183:
-#line 1303 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 184:
+#line 1329 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
                gi_source_symbol_merge_type ((yyval.symbol), gi_source_array_new (NULL));
          }
-#line 3700 "scannerparser.c" /* yacc.c:1646  */
+#line 3697 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 184:
-#line 1308 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 185:
+#line 1334 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
                gi_source_symbol_merge_type ((yyval.symbol), gi_source_array_new ((yyvsp[-1].symbol)));
          }
-#line 3709 "scannerparser.c" /* yacc.c:1646  */
+#line 3706 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 185:
-#line 1313 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 186:
+#line 1339 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[-2].symbol);
                gi_source_symbol_merge_type ((yyval.symbol), gi_source_array_new (NULL));
          }
-#line 3718 "scannerparser.c" /* yacc.c:1646  */
+#line 3715 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 186:
-#line 1318 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 187:
+#line 1344 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.symbol) = (yyvsp[-3].symbol);
                gi_source_symbol_merge_type ((yyval.symbol), gi_source_array_new ((yyvsp[-1].symbol)));
          }
-#line 3727 "scannerparser.c" /* yacc.c:1646  */
+#line 3724 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 187:
-#line 1323 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 188:
+#line 1349 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                GISourceType *func = gi_source_function_new ();
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
                gi_source_symbol_merge_type ((yyval.symbol), func);
          }
-#line 3737 "scannerparser.c" /* yacc.c:1646  */
+#line 3734 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 188:
-#line 1329 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 189:
+#line 1355 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                GISourceType *func = gi_source_function_new ();
                // ignore (void) parameter list
@@ -3747,21 +3744,21 @@ yyreduce:
                (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
                gi_source_symbol_merge_type ((yyval.symbol), func);
          }
-#line 3751 "scannerparser.c" /* yacc.c:1646  */
+#line 3748 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 189:
-#line 1339 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 190:
+#line 1365 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                GISourceType *func = gi_source_function_new ();
                (yyval.symbol) = (yyvsp[-2].symbol);
                gi_source_symbol_merge_type ((yyval.symbol), func);
          }
-#line 3761 "scannerparser.c" /* yacc.c:1646  */
+#line 3758 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 190:
-#line 1345 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 191:
+#line 1371 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                GISourceType *func = gi_source_function_new ();
                // ignore (void) parameter list
@@ -3771,121 +3768,127 @@ yyreduce:
                (yyval.symbol) = (yyvsp[-3].symbol);
                gi_source_symbol_merge_type ((yyval.symbol), func);
          }
-#line 3775 "scannerparser.c" /* yacc.c:1646  */
+#line 3772 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 191:
-#line 1358 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 192:
+#line 1384 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.str) = g_strdup (yytext);
          }
-#line 3783 "scannerparser.c" /* yacc.c:1646  */
+#line 3780 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 241:
-#line 1465 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 242:
+#line 1491 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.str) = g_strdup (yytext + strlen ("#define "));
          }
-#line 3791 "scannerparser.c" /* yacc.c:1646  */
+#line 3788 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 242:
-#line 1472 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 243:
+#line 1498 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                (yyval.str) = g_strdup (yytext + strlen ("#define "));
          }
-#line 3799 "scannerparser.c" /* yacc.c:1646  */
+#line 3796 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 244:
-#line 1483 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 245:
+#line 1509 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                if ((yyvsp[0].symbol)->const_int_set || (yyvsp[0].symbol)->const_boolean_set || (yyvsp[0].symbol)->const_double_set || (yyvsp[0].symbol)->const_string != NULL) {
-                       (yyvsp[0].symbol)->ident = (yyvsp[-1].str);
-                       gi_source_scanner_add_symbol (scanner, (yyvsp[0].symbol));
+                       GISourceSymbol *macro = gi_source_symbol_copy ((yyvsp[0].symbol));
+                       g_free (macro->ident);
+                       macro->ident = (yyvsp[-1].str);
+                       gi_source_scanner_add_symbol (scanner, macro);
+                       gi_source_symbol_unref (macro);
+                       gi_source_symbol_unref ((yyvsp[0].symbol));
+               } else {
+                       g_free ((yyvsp[-1].str));
                        gi_source_symbol_unref ((yyvsp[0].symbol));
                }
          }
-#line 3811 "scannerparser.c" /* yacc.c:1646  */
+#line 3814 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 245:
-#line 1494 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 246:
+#line 1526 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                push_conditional (scanner, FOR_GI_SCANNER);
                update_skipping (scanner);
          }
-#line 3820 "scannerparser.c" /* yacc.c:1646  */
+#line 3823 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 246:
-#line 1499 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 247:
+#line 1531 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                push_conditional (scanner, NOT_GI_SCANNER);
                update_skipping (scanner);
          }
-#line 3829 "scannerparser.c" /* yacc.c:1646  */
+#line 3832 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 247:
-#line 1504 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 248:
+#line 1536 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                warn_if_cond_has_gi_scanner (scanner, yytext);
                push_conditional (scanner, IRRELEVANT);
          }
-#line 3838 "scannerparser.c" /* yacc.c:1646  */
+#line 3841 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 248:
-#line 1509 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 249:
+#line 1541 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                warn_if_cond_has_gi_scanner (scanner, yytext);
                push_conditional (scanner, IRRELEVANT);
          }
-#line 3847 "scannerparser.c" /* yacc.c:1646  */
+#line 3850 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 249:
-#line 1514 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 250:
+#line 1546 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                warn_if_cond_has_gi_scanner (scanner, yytext);
                push_conditional (scanner, IRRELEVANT);
          }
-#line 3856 "scannerparser.c" /* yacc.c:1646  */
+#line 3859 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 250:
-#line 1519 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 251:
+#line 1551 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                warn_if_cond_has_gi_scanner (scanner, yytext);
                pop_conditional (scanner);
                push_conditional (scanner, IRRELEVANT);
                update_skipping (scanner);
          }
-#line 3867 "scannerparser.c" /* yacc.c:1646  */
+#line 3870 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 251:
-#line 1526 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 252:
+#line 1558 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                toggle_conditional (scanner);
                update_skipping (scanner);
          }
-#line 3876 "scannerparser.c" /* yacc.c:1646  */
+#line 3879 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 252:
-#line 1531 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 253:
+#line 1563 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                pop_conditional (scanner);
                update_skipping (scanner);
          }
-#line 3885 "scannerparser.c" /* yacc.c:1646  */
+#line 3888 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
 
-#line 3889 "scannerparser.c" /* yacc.c:1646  */
+#line 3892 "giscanner/scannerparser.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -4113,7 +4116,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 1544 "giscanner/scannerparser.y" /* yacc.c:1906  */
+#line 1576 "giscanner/scannerparser.y" /* yacc.c:1906  */
 
 static void
 yyerror (GISourceScanner *scanner, const char *s)
@@ -4337,16 +4340,9 @@ gi_source_scanner_parse_file (GISourceScanner *scanner, FILE *file)
 {
   g_return_val_if_fail (file != NULL, FALSE);
 
-  const_table = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                      g_free, (GDestroyNotify)gi_source_symbol_unref);
-
   lineno = 1;
   yyin = file;
   yyparse (scanner);
-
-  g_hash_table_destroy (const_table);
-  const_table = NULL;
-
   yyin = NULL;
 
   return TRUE;

diff --git a/scannerparser.h b/giscanner/scannerparser.h
similarity index 81%
rename from scannerparser.h
rename to giscanner/scannerparser.h
index 7e82e05..23ec535 100644 (file)
--- a/scannerparser.h
+++ b/giscanner/scannerparser.h
@@ -30,8 +30,8 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_YY_SCANNERPARSER_H_INCLUDED
-# define YY_YY_SCANNERPARSER_H_INCLUDED
+#ifndef YY_YY_GISCANNER_SCANNERPARSER_H_INCLUDED
+# define YY_YY_GISCANNER_SCANNERPARSER_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 1
@@ -106,22 +106,23 @@ extern int yydebug;
     STATIC = 316,
     STRUCT = 317,
     SWITCH = 318,
-    TYPEDEF = 319,
-    UNION = 320,
-    UNSIGNED = 321,
-    VOID = 322,
-    VOLATILE = 323,
-    WHILE = 324,
-    FUNCTION_MACRO = 325,
-    OBJECT_MACRO = 326,
-    IFDEF_GI_SCANNER = 327,
-    IFNDEF_GI_SCANNER = 328,
-    IFDEF_COND = 329,
-    IFNDEF_COND = 330,
-    IF_COND = 331,
-    ELIF_COND = 332,
-    ELSE_COND = 333,
-    ENDIF_COND = 334
+    THREAD_LOCAL = 319,
+    TYPEDEF = 320,
+    UNION = 321,
+    UNSIGNED = 322,
+    VOID = 323,
+    VOLATILE = 324,
+    WHILE = 325,
+    FUNCTION_MACRO = 326,
+    OBJECT_MACRO = 327,
+    IFDEF_GI_SCANNER = 328,
+    IFNDEF_GI_SCANNER = 329,
+    IFDEF_COND = 330,
+    IFNDEF_COND = 331,
+    IF_COND = 332,
+    ELIF_COND = 333,
+    ELSE_COND = 334,
+    ENDIF_COND = 335
   };
 #endif
 /* Tokens.  */
@@ -186,29 +187,30 @@ extern int yydebug;
 #define STATIC 316
 #define STRUCT 317
 #define SWITCH 318
-#define TYPEDEF 319
-#define UNION 320
-#define UNSIGNED 321
-#define VOID 322
-#define VOLATILE 323
-#define WHILE 324
-#define FUNCTION_MACRO 325
-#define OBJECT_MACRO 326
-#define IFDEF_GI_SCANNER 327
-#define IFNDEF_GI_SCANNER 328
-#define IFDEF_COND 329
-#define IFNDEF_COND 330
-#define IF_COND 331
-#define ELIF_COND 332
-#define ELSE_COND 333
-#define ENDIF_COND 334
+#define THREAD_LOCAL 319
+#define TYPEDEF 320
+#define UNION 321
+#define UNSIGNED 322
+#define VOID 323
+#define VOLATILE 324
+#define WHILE 325
+#define FUNCTION_MACRO 326
+#define OBJECT_MACRO 327
+#define IFDEF_GI_SCANNER 328
+#define IFNDEF_GI_SCANNER 329
+#define IFDEF_COND 330
+#define IFNDEF_COND 331
+#define IF_COND 332
+#define ELIF_COND 333
+#define ELSE_COND 334
+#define ENDIF_COND 335
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 
 union YYSTYPE
 {
-#line 212 "giscanner/scannerparser.y" /* yacc.c:1909  */
+#line 234 "giscanner/scannerparser.y" /* yacc.c:1909  */
 
   char *str;
   GList *list;
@@ -219,7 +221,7 @@ union YYSTYPE
   FunctionSpecifier function_specifier;
   UnaryOperator unary_operator;
 
-#line 223 "scannerparser.h" /* yacc.c:1909  */
+#line 225 "giscanner/scannerparser.h" /* yacc.c:1909  */
 };
 
 typedef union YYSTYPE YYSTYPE;
@@ -232,4 +234,4 @@ extern YYSTYPE yylval;
 
 int yyparse (GISourceScanner* scanner);
 
-#endif /* !YY_YY_SCANNERPARSER_H_INCLUDED  */
+#endif /* !YY_YY_GISCANNER_SCANNERPARSER_H_INCLUDED  */

diff --git a/giscanner/scannerparser.y b/giscanner/scannerparser.y
index 4a40d6a..abfbe06 100644 (file)
--- a/giscanner/scannerparser.y
+++ b/giscanner/scannerparser.y
@@ -48,7 +48,6 @@ extern void ctype_free (GISourceType * type);
 
 static int last_enum_value = -1;
 static gboolean is_bitfield;
-static GHashTable *const_table = NULL;
 
 /**
  * parse_c_string_literal:
@@ -206,6 +205,29 @@ toggle_conditional (GISourceScanner *scanner)
     }
 }
 
+static void
+set_or_merge_base_type (GISourceType *type,
+                        GISourceType *base)
+{
+  if (base->type == CTYPE_INVALID)
+    {
+      g_assert (base->base_type == NULL);
+
+      type->storage_class_specifier |= base->storage_class_specifier;
+      type->type_qualifier |= base->type_qualifier;
+      type->function_specifier |= base->function_specifier;
+      type->is_bitfield |= base->is_bitfield;
+
+      ctype_free (base);
+    }
+  else
+    {
+      g_assert (type->base_type == NULL);
+
+      type->base_type = base;
+    }
+}
+
 %}
 
 %error-verbose
@@ -234,8 +256,8 @@ toggle_conditional (GISourceScanner *scanner)
 
 %token AUTO BOOL BREAK CASE CHAR CONST CONTINUE DEFAULT DO DOUBLE ELSE ENUM
 %token EXTENSION EXTERN FLOAT FOR GOTO IF INLINE INT LONG REGISTER RESTRICT
-%token RETURN SHORT SIGNED SIZEOF STATIC STRUCT SWITCH TYPEDEF UNION UNSIGNED
-%token VOID VOLATILE WHILE
+%token RETURN SHORT SIGNED SIZEOF STATIC STRUCT SWITCH THREAD_LOCAL TYPEDEF
+%token UNION UNSIGNED VOID VOLATILE WHILE
 
 %token FUNCTION_MACRO OBJECT_MACRO
 %token IFDEF_GI_SCANNER IFNDEF_GI_SCANNER
@@ -303,7 +325,7 @@ toggle_conditional (GISourceScanner *scanner)
 primary_expression
        : identifier
          {
-               $$ = g_hash_table_lookup (const_table, $1);
+               $$ = g_hash_table_lookup (scanner->const_table, $1);
                if ($$ == NULL) {
                        $$ = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
                } else {
@@ -786,7 +808,7 @@ declaration_specifiers
                        $$->name = name;
                        ctype_free ($2);
                } else {
-                       $$->base_type = $2;
+                       set_or_merge_base_type ($1, $2);
                }
          }
        | type_specifier
@@ -849,6 +871,10 @@ storage_class_specifier
          {
                $$ = STORAGE_CLASS_REGISTER;
          }
+       | THREAD_LOCAL
+         {
+               $$ = STORAGE_CLASS_THREAD_LOCAL;
+         }
        ;
 
 type_specifier
@@ -979,7 +1005,7 @@ specifier_qualifier_list
        : type_specifier specifier_qualifier_list
          {
                $$ = $1;
-               $$->base_type = $2;
+               set_or_merge_base_type ($1, $2);
          }
        | type_specifier
        | type_qualifier specifier_qualifier_list
@@ -1093,7 +1119,7 @@ enumerator
                $$->ident = $1;
                $$->const_int_set = TRUE;
                $$->const_int = ++last_enum_value;
-               g_hash_table_insert (const_table, g_strdup ($$->ident), gi_source_symbol_ref ($$));
+               g_hash_table_insert (scanner->const_table, g_strdup ($$->ident), gi_source_symbol_ref ($$));
          }
        | identifier '=' constant_expression
          {
@@ -1102,7 +1128,7 @@ enumerator
                $$->const_int_set = TRUE;
                $$->const_int = $3->const_int;
                last_enum_value = $$->const_int;
-               g_hash_table_insert (const_table, g_strdup ($$->ident), gi_source_symbol_ref ($$));
+               g_hash_table_insert (scanner->const_table, g_strdup ($$->ident), gi_source_symbol_ref ($$));
          }
        ;
 
@@ -1482,8 +1508,14 @@ object_macro_define
        : object_macro constant_expression
          {
                if ($2->const_int_set || $2->const_boolean_set || $2->const_double_set || $2->const_string != NULL) {
-                       $2->ident = $1;
-                       gi_source_scanner_add_symbol (scanner, $2);
+                       GISourceSymbol *macro = gi_source_symbol_copy ($2);
+                       g_free (macro->ident);
+                       macro->ident = $1;
+                       gi_source_scanner_add_symbol (scanner, macro);
+                       gi_source_symbol_unref (macro);
+                       gi_source_symbol_unref ($2);
+               } else {
+                       g_free ($1);
                        gi_source_symbol_unref ($2);
                }
          }
@@ -1764,16 +1796,9 @@ gi_source_scanner_parse_file (GISourceScanner *scanner, FILE *file)
 {
   g_return_val_if_fail (file != NULL, FALSE);
 
-  const_table = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                      g_free, (GDestroyNotify)gi_source_symbol_unref);
-
   lineno = 1;
   yyin = file;
   yyparse (scanner);
-
-  g_hash_table_destroy (const_table);
-  const_table = NULL;
-
   yyin = NULL;
 
   return TRUE;

diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
index c93d20c..525bdba 100644 (file)
--- a/giscanner/shlibs.py
+++ b/giscanner/shlibs.py
@@ -29,7 +29,7 @@ import platform
 import re
 import subprocess
 
-from .utils import get_libtool_command, extract_libtool_shlib
+from .utils import get_libtool_command, extract_libtool_shlib, host_os
 from .ccompiler import CCompiler
 
 
@@ -94,7 +94,7 @@ def _resolve_non_libtool(options, binary, libraries):
         else:
             binary.args[0] = old_argdir
 
-    if os.name == 'nt':
+    if host_os() == 'nt':
         cc = CCompiler()
         shlibs = cc.resolve_windows_libs(libraries, options)
 
@@ -117,6 +117,11 @@ def _resolve_non_libtool(options, binary, libraries):
         shlibs = []
         for line in proc.stdout:
             line = line.decode('ascii')
+            # ldd on *BSD show the argument passed on the first line even if
+            # there is only one argument. We have to ignore it because it is
+            # possible for the name of the binary to match _ldd_library_pattern.
+            if line == binary.args[0] + ':\n':
+                continue
             for library, pattern in patterns.items():
                 m = pattern.search(line)
                 if m:

diff --git a/giscanner/sourcescanner.c b/giscanner/sourcescanner.c
index 7de891f..8c40017 100644 (file)
--- a/giscanner/sourcescanner.c
+++ b/giscanner/sourcescanner.c
@@ -218,6 +218,8 @@ gi_source_scanner_new (void)
   scanner = g_slice_new0 (GISourceScanner);
   scanner->typedef_table = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                   g_free, NULL);
+  scanner->const_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+                                                (GDestroyNotify) gi_source_symbol_unref);
   scanner->files = g_hash_table_new_full (g_file_hash, (GEqualFunc)g_file_equal,
                                           g_object_unref, NULL);
   g_queue_init (&scanner->conditionals);
@@ -238,6 +240,7 @@ gi_source_scanner_free (GISourceScanner *scanner)
   g_object_unref (scanner->current_file);
 
   g_hash_table_destroy (scanner->typedef_table);
+  g_hash_table_destroy (scanner->const_table);
 
   g_slist_foreach (scanner->comments, (GFunc)gi_source_comment_free, NULL);
   g_slist_free (scanner->comments);

diff --git a/giscanner/sourcescanner.h b/giscanner/sourcescanner.h
index 9e37131..c3e9c65 100644 (file)
--- a/giscanner/sourcescanner.h
+++ b/giscanner/sourcescanner.h
@@ -69,7 +69,8 @@ typedef enum
   STORAGE_CLASS_EXTERN = 1 << 2,
   STORAGE_CLASS_STATIC = 1 << 3,
   STORAGE_CLASS_AUTO = 1 << 4,
-  STORAGE_CLASS_REGISTER = 1 << 5
+  STORAGE_CLASS_REGISTER = 1 << 5,
+  STORAGE_CLASS_THREAD_LOCAL = 1 << 6
 } StorageClassSpecifier;
 
 typedef enum
@@ -114,6 +115,7 @@ struct _GISourceScanner
   GHashTable *files;
   GSList *comments; /* _GIComment */
   GHashTable *typedef_table;
+  GHashTable *const_table;
   gboolean skipping;
   GQueue conditionals;
 };

diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py
index 30fa75f..0577ced 100644 (file)
--- a/giscanner/sourcescanner.py
+++ b/giscanner/sourcescanner.py
@@ -70,6 +70,7 @@ STORAGE_CLASS_EXTERN = 1 << 2
 STORAGE_CLASS_STATIC = 1 << 3
 STORAGE_CLASS_AUTO = 1 << 4
 STORAGE_CLASS_REGISTER = 1 << 5
+STORAGE_CLASS_THREAD_LOCAL = 1 << 6
 
 TYPE_QUALIFIER_NONE = 0
 TYPE_QUALIFIER_CONST = 1 << 1

diff --git a/giscanner/utils.py b/giscanner/utils.py
index 4865ca8..09132b2 100644 (file)
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
@@ -184,6 +184,10 @@ def cflag_real_include_path(cflag):
     return "-I" + os.path.realpath(cflag[2:])
 
 
+def host_os():
+    return os.environ.get("GI_HOST_OS", os.name)
+
+
 def which(program):
     def is_exe(fpath):
         return os.path.isfile(fpath) and os.access(fpath, os.X_OK)

diff --git a/gobject-introspection-1.0.pc b/gobject-introspection-1.0.pc
index 13a0b1f..ac3de9f 100644 (file)
--- a/gobject-introspection-1.0.pc
+++ b/gobject-introspection-1.0.pc
@@ -21,4 +21,4 @@ Libs.private:
 
 Name: gobject-introspection
 Description: GObject Introspection
-Version: 1.55.1
+Version: 1.55.2

diff --git a/gobject-introspection-no-export-1.0.pc b/gobject-introspection-no-export-1.0.pc
index 83f6ad3..14cb10c 100644 (file)
--- a/gobject-introspection-no-export-1.0.pc
+++ b/gobject-introspection-no-export-1.0.pc
@@ -20,4 +20,4 @@ Libs.private:
 
 Name: gobject-introspection
 Description: GObject Introspection
-Version: 1.55.1
+Version: 1.55.2

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 2b50ecb..af04c46 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -735,22 +735,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimarshallingtests.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<

diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am
index a40e90b..0df9c15 100644 (file)
--- a/tests/offsets/Makefile.am
+++ b/tests/offsets/Makefile.am
@@ -24,7 +24,7 @@ Offsets-1.0.gir: liboffsets.la offsets.h
 Offsets_1_0_gir_INCLUDES = GObject-2.0
 Offsets_1_0_gir_LIBS = liboffsets.la
 Offsets_1_0_gir_PACKAGES = gobject-2.0
-Offsets_1_0_gir_FILES = $(srcdir)/offsets.h $(srcdir)/offsets.c
+Offsets_1_0_gir_FILES = offsets.h offsets.c
 Offsets_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error  -I$(top_srcdir)/tests
 INTROSPECTION_GIRS += Offsets-1.0.gir
 

diff --git a/tests/offsets/Makefile.in b/tests/offsets/Makefile.in
index a10da3f..e65ac9e 100644 (file)
--- a/tests/offsets/Makefile.in
+++ b/tests/offsets/Makefile.in
@@ -700,7 +700,7 @@ _gir_silent_scanner_opts_0 = --quiet
 _gir_silent_compiler = $(_gir_silent_compiler_$(V))
 _gir_silent_compiler_ = $(_gir_silent_compiler_$(_gir_verbosity))
 _gir_silent_compiler_0 = @echo "  GICOMP   $(1)";
-_gir_default_scanner_env = CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)"
+_gir_default_scanner_env = CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" GI_HOST_OS="$(GI_HOST_OS)" DLLTOOL="$(DLLTOOL)"
 BUILT_SOURCES = gitestoffsets.c
 CLEANFILES = Offsets-1.0.gir Offsets-1.0.typelib liboffsets.la \
        gitestoffsets.c $(EXTRA_PROGRAMS) offsets.compiled \
@@ -720,7 +720,7 @@ liboffsets_la_LDFLAGS = -avoid-version -rpath $(libdir)
 Offsets_1_0_gir_INCLUDES = GObject-2.0
 Offsets_1_0_gir_LIBS = liboffsets.la
 Offsets_1_0_gir_PACKAGES = gobject-2.0
-Offsets_1_0_gir_FILES = $(srcdir)/offsets.h $(srcdir)/offsets.c
+Offsets_1_0_gir_FILES = offsets.h offsets.c
 Offsets_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error  -I$(top_srcdir)/tests
 nodist_gitestoffsets_SOURCES = gitestoffsets.c
 gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -I$(top_srcdir)/tests
@@ -781,22 +781,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboffsets_la-offsets.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<

diff --git a/tests/repository/Makefile.am b/tests/repository/Makefile.am
index d1cbaa5..6b4b782 100644 (file)
--- a/tests/repository/Makefile.am
+++ b/tests/repository/Makefile.am
@@ -5,19 +5,19 @@ LIBS = $(GOBJECT_LIBS)
 EXTRA_PROGRAMS = gitestrepo giteststructinfo gitestthrows gitypelibtest
 CLEANFILES = $(EXTRA_PROGRAMS)
 
-gitestrepo_SOURCES = $(srcdir)/gitestrepo.c
+gitestrepo_SOURCES = gitestrepo.c
 gitestrepo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 gitestrepo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
 
-giteststructinfo_SOURCES = $(srcdir)/giteststructinfo.c
+giteststructinfo_SOURCES = giteststructinfo.c
 giteststructinfo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 giteststructinfo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
 
-gitestthrows_SOURCES = $(srcdir)/gitestthrows.c
+gitestthrows_SOURCES = gitestthrows.c
 gitestthrows_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 gitestthrows_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
 
-gitypelibtest_SOURCES = $(srcdir)/gitypelibtest.c
+gitypelibtest_SOURCES = gitypelibtest.c
 gitypelibtest_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 gitypelibtest_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
 

diff --git a/tests/repository/Makefile.in b/tests/repository/Makefile.in
index 161a6fa..136f05b 100644 (file)
--- a/tests/repository/Makefile.in
+++ b/tests/repository/Makefile.in
@@ -579,16 +579,16 @@ top_srcdir = @top_srcdir@
 AM_CFLAGS = $(GOBJECT_CFLAGS)
 AM_LDFLAGS = -module -avoid-version
 CLEANFILES = $(EXTRA_PROGRAMS)
-gitestrepo_SOURCES = $(srcdir)/gitestrepo.c
+gitestrepo_SOURCES = gitestrepo.c
 gitestrepo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 gitestrepo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
-giteststructinfo_SOURCES = $(srcdir)/giteststructinfo.c
+giteststructinfo_SOURCES = giteststructinfo.c
 giteststructinfo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 giteststructinfo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
-gitestthrows_SOURCES = $(srcdir)/gitestthrows.c
+gitestthrows_SOURCES = gitestthrows.c
 gitestthrows_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 gitestthrows_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
-gitypelibtest_SOURCES = $(srcdir)/gitypelibtest.c
+gitypelibtest_SOURCES = gitypelibtest.c
 gitypelibtest_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 gitypelibtest_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
 TESTS_ENVIRONMENT = env GI_TYPELIB_PATH="$(top_builddir):$(top_builddir)/gir:$(top_builddir)/tests:$(top_builddir)/tests/scanner" \
@@ -659,81 +659,84 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gitypelibtest-gitypelibtest.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-gitestrepo-gitestrepo.o: $(srcdir)/gitestrepo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestrepo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitestrepo-gitestrepo.o -MD -MP -MF $(DEPDIR)/gitestrepo-gitestrepo.Tpo -c -o gitestrepo-gitestrepo.o `test -f '$(srcdir)/gitestrepo.c' || echo '$(srcdir)/'`$(srcdir)/gitestrepo.c
+gitestrepo-gitestrepo.o: gitestrepo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestrepo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitestrepo-gitestrepo.o -MD -MP -MF $(DEPDIR)/gitestrepo-gitestrepo.Tpo -c -o gitestrepo-gitestrepo.o `test -f 'gitestrepo.c' || echo '$(srcdir)/'`gitestrepo.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gitestrepo-gitestrepo.Tpo $(DEPDIR)/gitestrepo-gitestrepo.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/gitestrepo.c' object='gitestrepo-gitestrepo.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='gitestrepo.c' object='gitestrepo-gitestrepo.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestrepo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitestrepo-gitestrepo.o `test -f '$(srcdir)/gitestrepo.c' || echo '$(srcdir)/'`$(srcdir)/gitestrepo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestrepo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitestrepo-gitestrepo.o `test -f 'gitestrepo.c' || echo '$(srcdir)/'`gitestrepo.c
 
-gitestrepo-gitestrepo.obj: $(srcdir)/gitestrepo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestrepo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitestrepo-gitestrepo.obj -MD -MP -MF $(DEPDIR)/gitestrepo-gitestrepo.Tpo -c -o gitestrepo-gitestrepo.obj `if test -f '$(srcdir)/gitestrepo.c'; then $(CYGPATH_W) '$(srcdir)/gitestrepo.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/gitestrepo.c'; fi`
+gitestrepo-gitestrepo.obj: gitestrepo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestrepo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitestrepo-gitestrepo.obj -MD -MP -MF $(DEPDIR)/gitestrepo-gitestrepo.Tpo -c -o gitestrepo-gitestrepo.obj `if test -f 'gitestrepo.c'; then $(CYGPATH_W) 'gitestrepo.c'; else $(CYGPATH_W) '$(srcdir)/gitestrepo.c'; fi`
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gitestrepo-gitestrepo.Tpo $(DEPDIR)/gitestrepo-gitestrepo.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/gitestrepo.c' object='gitestrepo-gitestrepo.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='gitestrepo.c' object='gitestrepo-gitestrepo.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestrepo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitestrepo-gitestrepo.obj `if test -f '$(srcdir)/gitestrepo.c'; then $(CYGPATH_W) '$(srcdir)/gitestrepo.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/gitestrepo.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestrepo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitestrepo-gitestrepo.obj `if test -f 'gitestrepo.c'; then $(CYGPATH_W) 'gitestrepo.c'; else $(CYGPATH_W) '$(srcdir)/gitestrepo.c'; fi`
 
-giteststructinfo-giteststructinfo.o: $(srcdir)/giteststructinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(giteststructinfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT giteststructinfo-giteststructinfo.o -MD -MP -MF $(DEPDIR)/giteststructinfo-giteststructinfo.Tpo -c -o giteststructinfo-giteststructinfo.o `test -f '$(srcdir)/giteststructinfo.c' || echo '$(srcdir)/'`$(srcdir)/giteststructinfo.c
+giteststructinfo-giteststructinfo.o: giteststructinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(giteststructinfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT giteststructinfo-giteststructinfo.o -MD -MP -MF $(DEPDIR)/giteststructinfo-giteststructinfo.Tpo -c -o giteststructinfo-giteststructinfo.o `test -f 'giteststructinfo.c' || echo '$(srcdir)/'`giteststructinfo.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/giteststructinfo-giteststructinfo.Tpo $(DEPDIR)/giteststructinfo-giteststructinfo.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/giteststructinfo.c' object='giteststructinfo-giteststructinfo.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='giteststructinfo.c' object='giteststructinfo-giteststructinfo.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(giteststructinfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o giteststructinfo-giteststructinfo.o `test -f '$(srcdir)/giteststructinfo.c' || echo '$(srcdir)/'`$(srcdir)/giteststructinfo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(giteststructinfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o giteststructinfo-giteststructinfo.o `test -f 'giteststructinfo.c' || echo '$(srcdir)/'`giteststructinfo.c
 
-giteststructinfo-giteststructinfo.obj: $(srcdir)/giteststructinfo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(giteststructinfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT giteststructinfo-giteststructinfo.obj -MD -MP -MF $(DEPDIR)/giteststructinfo-giteststructinfo.Tpo -c -o giteststructinfo-giteststructinfo.obj `if test -f '$(srcdir)/giteststructinfo.c'; then $(CYGPATH_W) '$(srcdir)/giteststructinfo.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/giteststructinfo.c'; fi`
+giteststructinfo-giteststructinfo.obj: giteststructinfo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(giteststructinfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT giteststructinfo-giteststructinfo.obj -MD -MP -MF $(DEPDIR)/giteststructinfo-giteststructinfo.Tpo -c -o giteststructinfo-giteststructinfo.obj `if test -f 'giteststructinfo.c'; then $(CYGPATH_W) 'giteststructinfo.c'; else $(CYGPATH_W) '$(srcdir)/giteststructinfo.c'; fi`
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/giteststructinfo-giteststructinfo.Tpo $(DEPDIR)/giteststructinfo-giteststructinfo.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/giteststructinfo.c' object='giteststructinfo-giteststructinfo.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='giteststructinfo.c' object='giteststructinfo-giteststructinfo.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(giteststructinfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o giteststructinfo-giteststructinfo.obj `if test -f '$(srcdir)/giteststructinfo.c'; then $(CYGPATH_W) '$(srcdir)/giteststructinfo.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/giteststructinfo.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(giteststructinfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o giteststructinfo-giteststructinfo.obj `if test -f 'giteststructinfo.c'; then $(CYGPATH_W) 'giteststructinfo.c'; else $(CYGPATH_W) '$(srcdir)/giteststructinfo.c'; fi`
 
-gitestthrows-gitestthrows.o: $(srcdir)/gitestthrows.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestthrows_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitestthrows-gitestthrows.o -MD -MP -MF $(DEPDIR)/gitestthrows-gitestthrows.Tpo -c -o gitestthrows-gitestthrows.o `test -f '$(srcdir)/gitestthrows.c' || echo '$(srcdir)/'`$(srcdir)/gitestthrows.c
+gitestthrows-gitestthrows.o: gitestthrows.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestthrows_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitestthrows-gitestthrows.o -MD -MP -MF $(DEPDIR)/gitestthrows-gitestthrows.Tpo -c -o gitestthrows-gitestthrows.o `test -f 'gitestthrows.c' || echo '$(srcdir)/'`gitestthrows.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gitestthrows-gitestthrows.Tpo $(DEPDIR)/gitestthrows-gitestthrows.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/gitestthrows.c' object='gitestthrows-gitestthrows.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='gitestthrows.c' object='gitestthrows-gitestthrows.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestthrows_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitestthrows-gitestthrows.o `test -f '$(srcdir)/gitestthrows.c' || echo '$(srcdir)/'`$(srcdir)/gitestthrows.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestthrows_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitestthrows-gitestthrows.o `test -f 'gitestthrows.c' || echo '$(srcdir)/'`gitestthrows.c
 
-gitestthrows-gitestthrows.obj: $(srcdir)/gitestthrows.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestthrows_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitestthrows-gitestthrows.obj -MD -MP -MF $(DEPDIR)/gitestthrows-gitestthrows.Tpo -c -o gitestthrows-gitestthrows.obj `if test -f '$(srcdir)/gitestthrows.c'; then $(CYGPATH_W) '$(srcdir)/gitestthrows.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/gitestthrows.c'; fi`
+gitestthrows-gitestthrows.obj: gitestthrows.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestthrows_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitestthrows-gitestthrows.obj -MD -MP -MF $(DEPDIR)/gitestthrows-gitestthrows.Tpo -c -o gitestthrows-gitestthrows.obj `if test -f 'gitestthrows.c'; then $(CYGPATH_W) 'gitestthrows.c'; else $(CYGPATH_W) '$(srcdir)/gitestthrows.c'; fi`
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gitestthrows-gitestthrows.Tpo $(DEPDIR)/gitestthrows-gitestthrows.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/gitestthrows.c' object='gitestthrows-gitestthrows.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='gitestthrows.c' object='gitestthrows-gitestthrows.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestthrows_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitestthrows-gitestthrows.obj `if test -f '$(srcdir)/gitestthrows.c'; then $(CYGPATH_W) '$(srcdir)/gitestthrows.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/gitestthrows.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestthrows_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitestthrows-gitestthrows.obj `if test -f 'gitestthrows.c'; then $(CYGPATH_W) 'gitestthrows.c'; else $(CYGPATH_W) '$(srcdir)/gitestthrows.c'; fi`
 
-gitypelibtest-gitypelibtest.o: $(srcdir)/gitypelibtest.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitypelibtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitypelibtest-gitypelibtest.o -MD -MP -MF $(DEPDIR)/gitypelibtest-gitypelibtest.Tpo -c -o gitypelibtest-gitypelibtest.o `test -f '$(srcdir)/gitypelibtest.c' || echo '$(srcdir)/'`$(srcdir)/gitypelibtest.c
+gitypelibtest-gitypelibtest.o: gitypelibtest.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitypelibtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitypelibtest-gitypelibtest.o -MD -MP -MF $(DEPDIR)/gitypelibtest-gitypelibtest.Tpo -c -o gitypelibtest-gitypelibtest.o `test -f 'gitypelibtest.c' || echo '$(srcdir)/'`gitypelibtest.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gitypelibtest-gitypelibtest.Tpo $(DEPDIR)/gitypelibtest-gitypelibtest.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/gitypelibtest.c' object='gitypelibtest-gitypelibtest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='gitypelibtest.c' object='gitypelibtest-gitypelibtest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitypelibtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitypelibtest-gitypelibtest.o `test -f '$(srcdir)/gitypelibtest.c' || echo '$(srcdir)/'`$(srcdir)/gitypelibtest.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitypelibtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitypelibtest-gitypelibtest.o `test -f 'gitypelibtest.c' || echo '$(srcdir)/'`gitypelibtest.c
 
-gitypelibtest-gitypelibtest.obj: $(srcdir)/gitypelibtest.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitypelibtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitypelibtest-gitypelibtest.obj -MD -MP -MF $(DEPDIR)/gitypelibtest-gitypelibtest.Tpo -c -o gitypelibtest-gitypelibtest.obj `if test -f '$(srcdir)/gitypelibtest.c'; then $(CYGPATH_W) '$(srcdir)/gitypelibtest.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/gitypelibtest.c'; fi`
+gitypelibtest-gitypelibtest.obj: gitypelibtest.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitypelibtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitypelibtest-gitypelibtest.obj -MD -MP -MF $(DEPDIR)/gitypelibtest-gitypelibtest.Tpo -c -o gitypelibtest-gitypelibtest.obj `if test -f 'gitypelibtest.c'; then $(CYGPATH_W) 'gitypelibtest.c'; else $(CYGPATH_W) '$(srcdir)/gitypelibtest.c'; fi`
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gitypelibtest-gitypelibtest.Tpo $(DEPDIR)/gitypelibtest-gitypelibtest.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/gitypelibtest.c' object='gitypelibtest-gitypelibtest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='gitypelibtest.c' object='gitypelibtest-gitypelibtest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitypelibtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitypelibtest-gitypelibtest.obj `if test -f '$(srcdir)/gitypelibtest.c'; then $(CYGPATH_W) '$(srcdir)/gitypelibtest.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/gitypelibtest.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitypelibtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitypelibtest-gitypelibtest.obj `if test -f 'gitypelibtest.c'; then $(CYGPATH_W) 'gitypelibtest.c'; else $(CYGPATH_W) '$(srcdir)/gitypelibtest.c'; fi`
 
 mostlyclean-libtool:
        -rm -f *.lo

diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 13156c3..6b705f5 100644 (file)
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -28,18 +28,18 @@ AM_CFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(GTHREAD_CFLAGS) $(GI_HIDDEN_VISIBI
 AM_LDFLAGS = -rpath /unused -avoid-version
 LIBS = $(GOBJECT_LIBS) $(GTHREAD_LIBS)
 
-libsletter_la_SOURCES = $(srcdir)/sletter.c $(srcdir)/sletter.h
+libsletter_la_SOURCES = sletter.c sletter.h
 libsletter_la_LIBADD = $(GIO_LIBS)
 libsletter_la_CFLAGS = $(AM_CFLAGS)
 libsletter_la_LDFLAGS = $(AM_LDFLAGS)
 
-libutility_la_SOURCES = $(srcdir)/utility.c $(srcdir)/utility.h
-libgtkfrob_la_SOURCES = $(srcdir)/gtkfrob.c $(srcdir)/gtkfrob.h
+libutility_la_SOURCES = utility.c utility.h
+libgtkfrob_la_SOURCES = gtkfrob.c gtkfrob.h
 libregress_la_SOURCES = \
-       $(srcdir)/regress.c $(srcdir)/regress.h \
-       $(srcdir)/annotation.c $(srcdir)/annotation.h \
-       $(srcdir)/foo.c $(srcdir)/foo.h \
-       $(srcdir)/drawable.c $(srcdir)/drawable.h \
+       regress.c regress.h \
+       annotation.c annotation.h \
+       foo.c foo.h \
+       drawable.c drawable.h \
        $(NULL)
 REGRESS_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 libregress_la_CPPFLAGS = -DREGRESS_PRINT_PREVIEW_COMMAND=\"$(REGRESS_PRINT_PREVIEW_COMMAND)\" \
@@ -49,11 +49,11 @@ if HAVE_CAIRO
 libregress_la_LIBADD += $(CAIRO_LIBS)
 endif
 libwarnlib_la_CFLAGS = $(AM_CFLAGS)
-libwarnlib_la_SOURCES = $(srcdir)/warnlib.c $(srcdir)/warnlib.h
+libwarnlib_la_SOURCES = warnlib.c warnlib.h
 libwarnlib_la_LIBADD = $(GIO_LIBS)
 libwarnlib_la_LDFLAGS = -export-symbols-regex '^warnlib_' -no-undefined
-libgettype_la_SOURCES = $(srcdir)/gettype.c $(srcdir)/gettype.h
-libtypedefs_la_SOURCES = $(srcdir)/typedefs.c $(srcdir)/typedefs.h
+libgettype_la_SOURCES = gettype.c gettype.h
+libtypedefs_la_SOURCES = typedefs.c typedefs.h
 
 testsdir = $(datadir)/gobject-introspection-1.0/tests
 tests_DATA = $(libregress_la_SOURCES) $(libwarnlib_la_SOURCES) $(libutility_la_SOURCES)
@@ -151,7 +151,7 @@ if !OS_WIN32
 EXTRA_PROGRAMS = barapp
 CLEANFILES += $(EXTRA_PROGRAMS)
 
-barapp_SOURCES = $(srcdir)/barapp.c $(srcdir)/barapp.h
+barapp_SOURCES = barapp.c barapp.h
 barapp_LDADD = $(top_builddir)/libgirepository-1.0.la
 barapp_LDFLAGS = -export-dynamic
 

diff --git a/tests/scanner/Makefile.in b/tests/scanner/Makefile.in
index d5fc951..04ae974 100644 (file)
--- a/tests/scanner/Makefile.in
+++ b/tests/scanner/Makefile.in
@@ -199,7 +199,7 @@ libwarnlib_la_OBJECTS = $(am_libwarnlib_la_OBJECTS)
 libwarnlib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libwarnlib_la_CFLAGS) \
        $(CFLAGS) $(libwarnlib_la_LDFLAGS) $(LDFLAGS) -o $@
-am__barapp_SOURCES_DIST = $(srcdir)/barapp.c $(srcdir)/barapp.h
+am__barapp_SOURCES_DIST = barapp.c barapp.h
 @OS_WIN32_FALSE@am_barapp_OBJECTS = barapp.$(OBJEXT)
 barapp_OBJECTS = $(am_barapp_OBJECTS)
 @OS_WIN32_FALSE@barapp_DEPENDENCIES =  \
@@ -799,7 +799,7 @@ _gir_silent_scanner_opts_0 = --quiet
 _gir_silent_compiler = $(_gir_silent_compiler_$(V))
 _gir_silent_compiler_ = $(_gir_silent_compiler_$(_gir_verbosity))
 _gir_silent_compiler_0 = @echo "  GICOMP   $(1)";
-_gir_default_scanner_env = CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)"
+_gir_default_scanner_env = CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" GI_HOST_OS="$(GI_HOST_OS)" DLLTOOL="$(DLLTOOL)"
 SUBDIRS = . annotationparser
 CLEANFILES = $(EXTRA_LTLIBRARIES) $(TYPELIBS) $(GIRS) $(am__append_6) \
        Headeronly-1.0.gir Identfilter-1.0.gir Symbolfilter-1.0.gir \
@@ -820,17 +820,17 @@ AM_CFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(GTHREAD_CFLAGS) $(GI_HIDDEN_VISIBI
 # -rpath needed to force libtool to build a shared library for a check_LTLIBRARIES
 # target. See http://lists.gnu.org/archive/html/automake/2005-10/msg00107.html
 AM_LDFLAGS = -rpath /unused -avoid-version $(am__append_4)
-libsletter_la_SOURCES = $(srcdir)/sletter.c $(srcdir)/sletter.h
+libsletter_la_SOURCES = sletter.c sletter.h
 libsletter_la_LIBADD = $(GIO_LIBS)
 libsletter_la_CFLAGS = $(AM_CFLAGS)
 libsletter_la_LDFLAGS = $(AM_LDFLAGS)
-libutility_la_SOURCES = $(srcdir)/utility.c $(srcdir)/utility.h
-libgtkfrob_la_SOURCES = $(srcdir)/gtkfrob.c $(srcdir)/gtkfrob.h
+libutility_la_SOURCES = utility.c utility.h
+libgtkfrob_la_SOURCES = gtkfrob.c gtkfrob.h
 libregress_la_SOURCES = \
-       $(srcdir)/regress.c $(srcdir)/regress.h \
-       $(srcdir)/annotation.c $(srcdir)/annotation.h \
-       $(srcdir)/foo.c $(srcdir)/foo.h \
-       $(srcdir)/drawable.c $(srcdir)/drawable.h \
+       regress.c regress.h \
+       annotation.c annotation.h \
+       foo.c foo.h \
+       drawable.c drawable.h \
        $(NULL)
 
 REGRESS_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f"
@@ -838,11 +838,11 @@ libregress_la_CPPFLAGS = -DREGRESS_PRINT_PREVIEW_COMMAND=\"$(REGRESS_PRINT_PREVI
        -DREGRESS_SOME_CHAR=\'c\' $(am__append_2)
 libregress_la_LIBADD = $(GIO_LIBS) $(am__append_1)
 libwarnlib_la_CFLAGS = $(AM_CFLAGS)
-libwarnlib_la_SOURCES = $(srcdir)/warnlib.c $(srcdir)/warnlib.h
+libwarnlib_la_SOURCES = warnlib.c warnlib.h
 libwarnlib_la_LIBADD = $(GIO_LIBS)
 libwarnlib_la_LDFLAGS = -export-symbols-regex '^warnlib_' -no-undefined
-libgettype_la_SOURCES = $(srcdir)/gettype.c $(srcdir)/gettype.h
-libtypedefs_la_SOURCES = $(srcdir)/typedefs.c $(srcdir)/typedefs.h
+libgettype_la_SOURCES = gettype.c gettype.h
+libtypedefs_la_SOURCES = typedefs.c typedefs.h
 testsdir = $(datadir)/gobject-introspection-1.0/tests
 tests_DATA = $(libregress_la_SOURCES) $(libwarnlib_la_SOURCES) $(libutility_la_SOURCES)
 libregress_la_CFLAGS = $(AM_CFLAGS) $(am__append_3)
@@ -902,7 +902,7 @@ Typedefs_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS)
 Typedefs_1_0_gir_INCLUDES = GObject-2.0
 Typedefs_1_0_gir_FILES = $(libtypedefs_la_SOURCES)
 Typedefs_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="typedefs.h" --identifier-prefix=Typedefs --symbol-prefix=typedefs
-@OS_WIN32_FALSE@barapp_SOURCES = $(srcdir)/barapp.c $(srcdir)/barapp.h
+@OS_WIN32_FALSE@barapp_SOURCES = barapp.c barapp.h
 @OS_WIN32_FALSE@barapp_LDADD = $(top_builddir)/libgirepository-1.0.la
 @OS_WIN32_FALSE@barapp_LDFLAGS = -export-dynamic
 @OS_WIN32_FALSE@Bar_1_0_gir_PACKAGES = gobject-2.0
@@ -1005,109 +1005,70 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utility.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-gettype.lo: $(srcdir)/gettype.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gettype.lo -MD -MP -MF $(DEPDIR)/gettype.Tpo -c -o gettype.lo `test -f '$(srcdir)/gettype.c' || echo '$(srcdir)/'`$(srcdir)/gettype.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gettype.Tpo $(DEPDIR)/gettype.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/gettype.c' object='gettype.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gettype.lo `test -f '$(srcdir)/gettype.c' || echo '$(srcdir)/'`$(srcdir)/gettype.c
-
-gtkfrob.lo: $(srcdir)/gtkfrob.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gtkfrob.lo -MD -MP -MF $(DEPDIR)/gtkfrob.Tpo -c -o gtkfrob.lo `test -f '$(srcdir)/gtkfrob.c' || echo '$(srcdir)/'`$(srcdir)/gtkfrob.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/gtkfrob.Tpo $(DEPDIR)/gtkfrob.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/gtkfrob.c' object='gtkfrob.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gtkfrob.lo `test -f '$(srcdir)/gtkfrob.c' || echo '$(srcdir)/'`$(srcdir)/gtkfrob.c
-
-libregress_la-regress.lo: $(srcdir)/regress.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -MT libregress_la-regress.lo -MD -MP -MF $(DEPDIR)/libregress_la-regress.Tpo -c -o libregress_la-regress.lo `test -f '$(srcdir)/regress.c' || echo '$(srcdir)/'`$(srcdir)/regress.c
+libregress_la-regress.lo: regress.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -MT libregress_la-regress.lo -MD -MP -MF $(DEPDIR)/libregress_la-regress.Tpo -c -o libregress_la-regress.lo `test -f 'regress.c' || echo '$(srcdir)/'`regress.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libregress_la-regress.Tpo $(DEPDIR)/libregress_la-regress.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/regress.c' object='libregress_la-regress.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='regress.c' object='libregress_la-regress.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -c -o libregress_la-regress.lo `test -f '$(srcdir)/regress.c' || echo '$(srcdir)/'`$(srcdir)/regress.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -c -o libregress_la-regress.lo `test -f 'regress.c' || echo '$(srcdir)/'`regress.c
 
-libregress_la-annotation.lo: $(srcdir)/annotation.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -MT libregress_la-annotation.lo -MD -MP -MF $(DEPDIR)/libregress_la-annotation.Tpo -c -o libregress_la-annotation.lo `test -f '$(srcdir)/annotation.c' || echo '$(srcdir)/'`$(srcdir)/annotation.c
+libregress_la-annotation.lo: annotation.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -MT libregress_la-annotation.lo -MD -MP -MF $(DEPDIR)/libregress_la-annotation.Tpo -c -o libregress_la-annotation.lo `test -f 'annotation.c' || echo '$(srcdir)/'`annotation.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libregress_la-annotation.Tpo $(DEPDIR)/libregress_la-annotation.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/annotation.c' object='libregress_la-annotation.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='annotation.c' object='libregress_la-annotation.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -c -o libregress_la-annotation.lo `test -f '$(srcdir)/annotation.c' || echo '$(srcdir)/'`$(srcdir)/annotation.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -c -o libregress_la-annotation.lo `test -f 'annotation.c' || echo '$(srcdir)/'`annotation.c
 
-libregress_la-foo.lo: $(srcdir)/foo.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -MT libregress_la-foo.lo -MD -MP -MF $(DEPDIR)/libregress_la-foo.Tpo -c -o libregress_la-foo.lo `test -f '$(srcdir)/foo.c' || echo '$(srcdir)/'`$(srcdir)/foo.c
+libregress_la-foo.lo: foo.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -MT libregress_la-foo.lo -MD -MP -MF $(DEPDIR)/libregress_la-foo.Tpo -c -o libregress_la-foo.lo `test -f 'foo.c' || echo '$(srcdir)/'`foo.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libregress_la-foo.Tpo $(DEPDIR)/libregress_la-foo.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/foo.c' object='libregress_la-foo.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='foo.c' object='libregress_la-foo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -c -o libregress_la-foo.lo `test -f '$(srcdir)/foo.c' || echo '$(srcdir)/'`$(srcdir)/foo.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -c -o libregress_la-foo.lo `test -f 'foo.c' || echo '$(srcdir)/'`foo.c
 
-libregress_la-drawable.lo: $(srcdir)/drawable.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -MT libregress_la-drawable.lo -MD -MP -MF $(DEPDIR)/libregress_la-drawable.Tpo -c -o libregress_la-drawable.lo `test -f '$(srcdir)/drawable.c' || echo '$(srcdir)/'`$(srcdir)/drawable.c
+libregress_la-drawable.lo: drawable.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -MT libregress_la-drawable.lo -MD -MP -MF $(DEPDIR)/libregress_la-drawable.Tpo -c -o libregress_la-drawable.lo `test -f 'drawable.c' || echo '$(srcdir)/'`drawable.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libregress_la-drawable.Tpo $(DEPDIR)/libregress_la-drawable.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/drawable.c' object='libregress_la-drawable.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='drawable.c' object='libregress_la-drawable.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -c -o libregress_la-drawable.lo `test -f '$(srcdir)/drawable.c' || echo '$(srcdir)/'`$(srcdir)/drawable.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libregress_la_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -c -o libregress_la-drawable.lo `test -f 'drawable.c' || echo '$(srcdir)/'`drawable.c
 
-libsletter_la-sletter.lo: $(srcdir)/sletter.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsletter_la_CFLAGS) $(CFLAGS) -MT libsletter_la-sletter.lo -MD -MP -MF $(DEPDIR)/libsletter_la-sletter.Tpo -c -o libsletter_la-sletter.lo `test -f '$(srcdir)/sletter.c' || echo '$(srcdir)/'`$(srcdir)/sletter.c
+libsletter_la-sletter.lo: sletter.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsletter_la_CFLAGS) $(CFLAGS) -MT libsletter_la-sletter.lo -MD -MP -MF $(DEPDIR)/libsletter_la-sletter.Tpo -c -o libsletter_la-sletter.lo `test -f 'sletter.c' || echo '$(srcdir)/'`sletter.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libsletter_la-sletter.Tpo $(DEPDIR)/libsletter_la-sletter.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/sletter.c' object='libsletter_la-sletter.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsletter_la_CFLAGS) $(CFLAGS) -c -o libsletter_la-sletter.lo `test -f '$(srcdir)/sletter.c' || echo '$(srcdir)/'`$(srcdir)/sletter.c
-
-typedefs.lo: $(srcdir)/typedefs.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT typedefs.lo -MD -MP -MF $(DEPDIR)/typedefs.Tpo -c -o typedefs.lo `test -f '$(srcdir)/typedefs.c' || echo '$(srcdir)/'`$(srcdir)/typedefs.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/typedefs.Tpo $(DEPDIR)/typedefs.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/typedefs.c' object='typedefs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sletter.c' object='libsletter_la-sletter.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o typedefs.lo `test -f '$(srcdir)/typedefs.c' || echo '$(srcdir)/'`$(srcdir)/typedefs.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsletter_la_CFLAGS) $(CFLAGS) -c -o libsletter_la-sletter.lo `test -f 'sletter.c' || echo '$(srcdir)/'`sletter.c
 
-utility.lo: $(srcdir)/utility.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT utility.lo -MD -MP -MF $(DEPDIR)/utility.Tpo -c -o utility.lo `test -f '$(srcdir)/utility.c' || echo '$(srcdir)/'`$(srcdir)/utility.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/utility.Tpo $(DEPDIR)/utility.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/utility.c' object='utility.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o utility.lo `test -f '$(srcdir)/utility.c' || echo '$(srcdir)/'`$(srcdir)/utility.c
-
-libwarnlib_la-warnlib.lo: $(srcdir)/warnlib.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwarnlib_la_CFLAGS) $(CFLAGS) -MT libwarnlib_la-warnlib.lo -MD -MP -MF $(DEPDIR)/libwarnlib_la-warnlib.Tpo -c -o libwarnlib_la-warnlib.lo `test -f '$(srcdir)/warnlib.c' || echo '$(srcdir)/'`$(srcdir)/warnlib.c
+libwarnlib_la-warnlib.lo: warnlib.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwarnlib_la_CFLAGS) $(CFLAGS) -MT libwarnlib_la-warnlib.lo -MD -MP -MF $(DEPDIR)/libwarnlib_la-warnlib.Tpo -c -o libwarnlib_la-warnlib.lo `test -f 'warnlib.c' || echo '$(srcdir)/'`warnlib.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libwarnlib_la-warnlib.Tpo $(DEPDIR)/libwarnlib_la-warnlib.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/warnlib.c' object='libwarnlib_la-warnlib.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwarnlib_la_CFLAGS) $(CFLAGS) -c -o libwarnlib_la-warnlib.lo `test -f '$(srcdir)/warnlib.c' || echo '$(srcdir)/'`$(srcdir)/warnlib.c
-
-barapp.o: $(srcdir)/barapp.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT barapp.o -MD -MP -MF $(DEPDIR)/barapp.Tpo -c -o barapp.o `test -f '$(srcdir)/barapp.c' || echo '$(srcdir)/'`$(srcdir)/barapp.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/barapp.Tpo $(DEPDIR)/barapp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/barapp.c' object='barapp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o barapp.o `test -f '$(srcdir)/barapp.c' || echo '$(srcdir)/'`$(srcdir)/barapp.c
-
-barapp.obj: $(srcdir)/barapp.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT barapp.obj -MD -MP -MF $(DEPDIR)/barapp.Tpo -c -o barapp.obj `if test -f '$(srcdir)/barapp.c'; then $(CYGPATH_W) '$(srcdir)/barapp.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/barapp.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/barapp.Tpo $(DEPDIR)/barapp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$(srcdir)/barapp.c' object='barapp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='warnlib.c' object='libwarnlib_la-warnlib.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o barapp.obj `if test -f '$(srcdir)/barapp.c'; then $(CYGPATH_W) '$(srcdir)/barapp.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/barapp.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwarnlib_la_CFLAGS) $(CFLAGS) -c -o libwarnlib_la-warnlib.lo `test -f 'warnlib.c' || echo '$(srcdir)/'`warnlib.c
 
 mostlyclean-libtool:
        -rm -f *.lo

diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_FLAGS_SECOND_AND_THIRD.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_FLAGS_SECOND_AND_THIRD.page
new file mode 100644 (file)
index 0000000..50df754
--- /dev/null
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_FLAGS_SECOND_AND_THIRD.page
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FOO_FLAGS_SECOND_AND_THIRD"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.FOO_FLAGS_SECOND_AND_THIRD</title>
+
+
+</page>

diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page
index 2f7fb86..5d8197a 100644 (file)
--- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page
@@ -13,14 +13,14 @@
       </api:returns>
       <api:name>regress_annotation_set_source_file</api:name>
       <api:arg>
-        <api:type>char*</api:type>
+        <api:type>const char*</api:type>
         <api:name>fname</api:name>
       </api:arg>
     </api:function>
   </info>
   <title>regress_annotation_set_source_file</title>
   <synopsis><code mime="text/x-csrc">
-void regress_annotation_set_source_file (char* fname);
+void regress_annotation_set_source_file (const char* fname);
   </code></synopsis>
 
 

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_FLAGS_SECOND_AND_THIRD.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_FLAGS_SECOND_AND_THIRD.page
new file mode 100644 (file)
index 0000000..50df754
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_FLAGS_SECOND_AND_THIRD.page
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FOO_FLAGS_SECOND_AND_THIRD"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.FOO_FLAGS_SECOND_AND_THIRD</title>
+
+
+</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page
index d7ac407..155fc8a 100644 (file)
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page
@@ -28,6 +28,10 @@
 <title><code>TestEnum.VALUE4</code></title>
 
 </item>
+<item>
+<title><code>TestEnum.VALUE5</code></title>
+
+</item>
 </terms>
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/x-gjs"

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_FLAGS_SECOND_AND_THIRD.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_FLAGS_SECOND_AND_THIRD.page
new file mode 100644 (file)
index 0000000..50df754
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_FLAGS_SECOND_AND_THIRD.page
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.FOO_FLAGS_SECOND_AND_THIRD"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.FOO_FLAGS_SECOND_AND_THIRD</title>
+
+
+</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page
index 10a6897..bcb6fbc 100644 (file)
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page
@@ -28,6 +28,10 @@
 <title><code>TestEnum.VALUE4</code></title>
 
 </item>
+<item>
+<title><code>TestEnum.VALUE5</code></title>
+
+</item>
 </terms>
 
 </page>

diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
index 0bee81e..cd47fcb 100644 (file)
--- a/tests/scanner/Regress-1.0-expected.gir
+++ b/tests/scanner/Regress-1.0-expected.gir
@@ -945,6 +945,11 @@ it says it's pointer but it's actually a string.</doc>
               c:type="REGRESS_FOO_DEFINE_SHOULD_BE_EXPOSED">
       <type name="utf8" c:type="gchar*"/>
     </constant>
+    <constant name="FOO_FLAGS_SECOND_AND_THIRD"
+              value="6"
+              c:type="REGRESS_FOO_FLAGS_SECOND_AND_THIRD">
+      <type name="gint" c:type="gint"/>
+    </constant>
     <constant name="FOO_PIE_IS_TASTY"
               value="3.141590"
               c:type="REGRESS_FOO_PIE_IS_TASTY">
@@ -2519,6 +2524,11 @@ use it should be.</doc>
               c:identifier="REGRESS_TEST_VALUE4"
               glib:nick="value4">
       </member>
+      <member name="value5"
+              value="49"
+              c:identifier="REGRESS_TEST_VALUE5"
+              glib:nick="value5">
+      </member>
       <function name="param" c:identifier="regress_test_enum_param">
         <return-value transfer-ownership="none">
           <type name="utf8" c:type="const gchar*"/>
@@ -4497,7 +4507,7 @@ detection, and fixing it via annotations.</doc>
       <parameters>
         <parameter name="fname" transfer-ownership="none">
           <doc xml:space="preserve">Source file</doc>
-          <type name="filename" c:type="char*"/>
+          <type name="filename" c:type="const char*"/>
         </parameter>
       </parameters>
     </function>

diff --git a/tests/scanner/foo.h b/tests/scanner/foo.h
index 02d9b7c..bf9d2c3 100644 (file)
--- a/tests/scanner/foo.h
+++ b/tests/scanner/foo.h
@@ -246,6 +246,7 @@ typedef enum
   REGRESS_FOO_FLAGS_THIRD  = 1 << 2
 } RegressFooFlagsType;
 
+#define REGRESS_FOO_FLAGS_SECOND_AND_THIRD (REGRESS_FOO_FLAGS_SECOND | REGRESS_FOO_FLAGS_THIRD)
 
 _GI_TEST_EXTERN
 GType regress_foo_flags_type_get_type (void);

diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c
index 5a53291..85e00d9 100644 (file)
--- a/tests/scanner/regress.c
+++ b/tests/scanner/regress.c
@@ -1549,6 +1549,7 @@ regress_test_enum_get_type (void)
             { REGRESS_TEST_VALUE2, "REGRESS_TEST_VALUE2", "value2" },
             { REGRESS_TEST_VALUE3, "REGRESS_TEST_VALUE3", "value3" },
             { REGRESS_TEST_VALUE4, "REGRESS_TEST_VALUE4", "value4" },
+            { REGRESS_TEST_VALUE5, "REGRESS_TEST_VALUE5", "value5" },
             { 0, NULL, NULL }
         };
         etype = g_enum_register_static (g_intern_static_string ("RegressTestEnum"), values);
@@ -4293,7 +4294,7 @@ regress_test_versioning (void)
 
 void
 regress_like_xkl_config_item_set_name (RegressLikeXklConfigItem *self,
-                                       const char *name)
+                                       char const *name)
 {
   strncpy (self->name, name, sizeof (self->name) - 1);
   self->name[sizeof(self->name)-1] = '\0';

diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h
index d6752a1..e1c995a 100644 (file)
--- a/tests/scanner/regress.h
+++ b/tests/scanner/regress.h
@@ -376,7 +376,8 @@ typedef enum
   REGRESS_TEST_VALUE1,
   REGRESS_TEST_VALUE2,
   REGRESS_TEST_VALUE3 = -1,
-  REGRESS_TEST_VALUE4 = '0'
+  REGRESS_TEST_VALUE4 = '0',
+  REGRESS_TEST_VALUE5
 } RegressTestEnum;
 
 typedef enum
@@ -422,6 +423,13 @@ typedef enum
   REGRESS_TEST_EVALUE3 = '0'
 } RegressTestEnumNoGEnum;
 
+/**
+ * REGRESS_TEST_EVALUE_DEPRECATED:
+ *
+ * Scanner used to replace %REGRESS_TEST_EVALUE1 with %REGRESS_TEST_EVALUE_DEPRECATED.
+ */
+#define REGRESS_TEST_EVALUE_DEPRECATED REGRESS_TEST_EVALUE1
+
 _GI_TEST_EXTERN
 const gchar * regress_test_enum_param(RegressTestEnum e);
 
@@ -1397,7 +1405,7 @@ typedef struct {
 
 _GI_TEST_EXTERN
 void regress_like_xkl_config_item_set_name (RegressLikeXklConfigItem *self,
-                                            const char *name);
+                                            char const *name);
 
 #define REGRESS_UTF8_CONSTANT "const \xe2\x99\xa5 utf8"
 

diff --git a/win32/vs10/gi-version-paths.props b/win32/vs10/gi-version-paths.props
index 531efbc..6e88557 100644 (file)
--- a/win32/vs10/gi-version-paths.props
+++ b/win32/vs10/gi-version-paths.props
@@ -14,7 +14,7 @@
     <PythonDirX64>$(PythonDir).x64</PythonDirX64>
     <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
     <IntrospectPythonParamX64>PYTHON=$(PythonDirX64)\python.exe</IntrospectPythonParamX64>
-    <GIVersion>1.55.1</GIVersion>
+    <GIVersion>1.55.2</GIVersion>
     <BASE_GI_DIR>$(SolutionDir)\..\..</BASE_GI_DIR>
     <ApiVersion>1.0</ApiVersion>
     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>

diff --git a/win32/vs11/gi-version-paths.props b/win32/vs11/gi-version-paths.props
index c9291bb..eae4408 100644 (file)
--- a/win32/vs11/gi-version-paths.props
+++ b/win32/vs11/gi-version-paths.props
@@ -14,7 +14,7 @@
     <PythonDirX64>$(PythonDir).x64</PythonDirX64>
     <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
     <IntrospectPythonParamX64>PYTHON=$(PythonDirX64)\python.exe</IntrospectPythonParamX64>
-    <GIVersion>1.55.1</GIVersion>
+    <GIVersion>1.55.2</GIVersion>
     <BASE_GI_DIR>$(SolutionDir)\..\..</BASE_GI_DIR>
     <ApiVersion>1.0</ApiVersion>
     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>

diff --git a/win32/vs12/gi-version-paths.props b/win32/vs12/gi-version-paths.props
index b9ab38e..cc3ccb9 100644 (file)
--- a/win32/vs12/gi-version-paths.props
+++ b/win32/vs12/gi-version-paths.props
@@ -14,7 +14,7 @@
     <PythonDirX64>$(PythonDir).x64</PythonDirX64>
     <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
     <IntrospectPythonParamX64>PYTHON=$(PythonDirX64)\python.exe</IntrospectPythonParamX64>
-    <GIVersion>1.55.1</GIVersion>
+    <GIVersion>1.55.2</GIVersion>
     <BASE_GI_DIR>$(SolutionDir)\..\..</BASE_GI_DIR>
     <ApiVersion>1.0</ApiVersion>
     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>

diff --git a/win32/vs14/gi-version-paths.props b/win32/vs14/gi-version-paths.props
index ddcc863..0dbe212 100644 (file)
--- a/win32/vs14/gi-version-paths.props
+++ b/win32/vs14/gi-version-paths.props
@@ -14,7 +14,7 @@
     <PythonDirX64>$(PythonDir).x64</PythonDirX64>
     <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
     <IntrospectPythonParamX64>PYTHON=$(PythonDirX64)\python.exe</IntrospectPythonParamX64>
-    <GIVersion>1.55.1</GIVersion>
+    <GIVersion>1.55.2</GIVersion>
     <BASE_GI_DIR>$(SolutionDir)\..\..</BASE_GI_DIR>
     <ApiVersion>1.0</ApiVersion>
     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>

diff --git a/win32/vs15/gi-version-paths.props b/win32/vs15/gi-version-paths.props
index fc87ad4..d3cd3ea 100644 (file)
--- a/win32/vs15/gi-version-paths.props
+++ b/win32/vs15/gi-version-paths.props
@@ -14,7 +14,7 @@
     <PythonDirX64>$(PythonDir).x64</PythonDirX64>
     <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
     <IntrospectPythonParamX64>PYTHON=$(PythonDirX64)\python.exe</IntrospectPythonParamX64>
-    <GIVersion>1.55.1</GIVersion>
+    <GIVersion>1.55.2</GIVersion>
     <BASE_GI_DIR>$(SolutionDir)\..\..</BASE_GI_DIR>
     <ApiVersion>1.0</ApiVersion>
     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>

diff --git a/win32/vs9/gi-version-paths.vsprops b/win32/vs9/gi-version-paths.vsprops
index b509522..4f41623 100644 (file)
--- a/win32/vs9/gi-version-paths.vsprops
+++ b/win32/vs9/gi-version-paths.vsprops
@@ -36,7 +36,7 @@
        />
        <UserMacro
                Name="GIVersion"
-               Value="1.55.1"
+               Value="1.55.2"
        />
        <UserMacro
                Name="BASE_GI_DIR"