Update autotools to Vala usage

src/Makefile.am

@@ -1,13 +1,69 @@
+include $(top_srcdir)/vala-globals.mk
+
 AM_CPPFLAGS = -DG_LOG_DOMAIN=\"Matrix-GLib\"
 
 # Empty variables for elements to be added later
 CLEANFILES =
 BUILT_SOURCES =
 EXTRA_DIST =
+AM_VALAFLAGS =
+
+# Name of the public header file
+PUBLIC_HEADER = matrix-glib.h
 
 # Libraries to create
 lib_LTLIBRARIES = libmatrix-glib-0.0.la
 
+# Vala source files
+libmatrix_glib_0_0_la_VALA_SOURCES = \
+	$(NULL)
+
+AM_CPPFLAGS += \
+	-include $(CONFIG_HEADER) \
+	-I$(top_srcdir) \
+	-g \
+	-Wall \
+	$(GLIB_CFLAGS) \
+	$(GOBJECT_CFLAGS) \
+	$(SOUP_CFLAGS) \
+	$(JSON_CFLAGS) \
+	$(VALA_CFLAGS) \
+	$(NULL)
+
+AM_VALAFLAGS += \
+	--library=Matrix-$(MATRIX_GLIB_API_VERSION) \
+	$(VALA_PKG_LIST) \
+	--vapi=Matrix-$(MATRIX_GLIB_API_VERSION).vapi \
+	-H $(PUBLIC_HEADER) \
+	-C \
+	--use-header \
+	--gir=Matrix-$(MATRIX_GLIB_API_VERSION).gir \
+	$(NULL)
+
+vala-stamp: $(libmatrix_glib_0_0_la_VALA_SOURCES)
+	@rm -f vala-temp
+	@touch vala-temp
+	$(AM_V_GEN) $(VALAC) $(AM_VALAFLAGS) $^
+	@mv -f vala-temp $@
+
+CLEANFILES += \
+	$(PUBLIC_HEADER) \
+	$(libmatrix_glib_0_0_la_VALA_SOURCES:.vala=.c) \
+	$(NULL)
+
+$(libmatrix_glib_0_0_la_VALA_SOURCES:.vala=.c): vala-stamp
+	@if test -f $@; then :; else \
+	    trap 'rm -rf vala-lock vala-stamp' 1 2 13 15; \
+	    if mkdir vala-lock 2> /dev/null; then \
+	        rm -f vala-stamp; \
+	        $(MAKE) $(AM_MAKEFLAGS) vala-stamp; \
+	        rmdir vala-lock; \
+	    else \
+	        while test -d vala-lock; do sleep 1; done; \
+	        test -f vala-stamp; exit $$?; \
+	    fi \
+	fi
+
 # Binaries to create
 bin_PROGRAMS = test-api-client
 
@@ -32,6 +88,7 @@ matrix_enum_headers = \
 libmatrix_glib_0_0_la_SOURCES = \
 	$(INST_H_BUILT_FILES) \
 	matrix-marshalers.c \
+	$(libmatrix_glib_0_0_la_VALA_SOURCES:.vala=.c) \
 	matrix-version.c \
 	matrix-types.c \
 	matrix-api.c \
@@ -60,6 +117,8 @@ libmatrix_glib_0_0_la_LIBADD = \
 libmatrix_glib_0_0_la_LDFLAGS = \
 	-version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)"
 
+$(PUBLIC_HEADER): vala-stamp
+
 BUILT_SOURCES += \
 	matrix-enumtypes.c \
 	matrix-enumtypes.h \
@@ -68,7 +127,7 @@ BUILT_SOURCES += \
 	$(NULL)
 
 test_api_client_SOURCES = test-api-client.c
-test_api_client_CFLAGS = $(libmatrix_glib_0_0_la_CFLAGS)
+test_api_client_CFLAGS = $(libmatrix_glib_0_0_la_CFLAGS) $(AM_CFLAGS)
 test_api_client_LDADD = \
 	$(libmatrix_glib_0_0_la_LIBADD) \
 	libmatrix-glib-$(MATRIX_GLIB_API_VERSION).la \
@@ -152,6 +211,7 @@ typelibs_DATA = Matrix-$(MATRIX_GLIB_API_VERSION).typelib
 
 headerdir = $(includedir)/matrix-glib-$(MATRIX_GLIB_API_VERSION)
 header_DATA = \
+	$(PUBLIC_HEADER) \
 	$(INST_H_SRC_FILES) \
 	$(INST_H_BUILT_FILES) \
 	$(NULL)

src/Matrix-0.0.deps

@@ -0,0 +1,3 @@
+gio-2.0
+Json-1.0
+libsoup-2.4