[vte] build: Manually generate the C source from the vala source



commit 4e2f53632637abba42b1ac558b738b63de18441e
Author: Christian Persch <chpe src gnome org>
Date:   Sun Nov 26 22:04:35 2017 +0100

    build: Manually generate the C source from the vala source
    
    Don't use the automake vala support, instead just generate
    the C sources manually. This fixes a build failure on
    non-srcdir builds.

 bindings/vala/Makefile.am |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 667af82..208d118 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -27,23 +27,13 @@ CLEANFILES += $(nodist_vapi_DATA)
 # VALA Test application
 
 app_SOURCES = \
-       app.vala \
-       config.vapi \
-       $(builddir)/vte-$(VTE_API_VERSION).vapi \
        $(NULL)
 
 nodist_app_SOURCES = \
+       app.c \
        appresources.c \
        $(NULL)
 
-app_VALAFLAGS = \
-       --target-glib=2.38 \
-       --pkg=posix \
-       --pkg=gio-2.0 \
-       --pkg=gtk+-$(GTK_API_VERSION) \
-       --gresources app.gresource.xml \
-       $(AM_VALAFLAGS)
-
 app_CPPFLAGS = \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/vte \
@@ -67,12 +57,20 @@ app_LDADD = \
        $(VTE_LIBS) \
        $(NULL)
 
+app_valaflags = \
+       --target-glib=2.38 \
+       --pkg=posix \
+       --pkg=gio-2.0 \
+       --pkg=gtk+-$(GTK_API_VERSION) \
+       --gresources $(srcdir)/app.gresource.xml \
+       $(AM_VALAFLAGS)
+
 if HAVE_VALA_0_31
-app_VALAFLAGS += --disable-since-check
+app_valaflags += --disable-since-check
 endif
 
 if HAVE_GTK_3_16
-app_VALAFLAGS += -D GTK_3_16
+app_valaflags += -D GTK_3_16
 endif
 
 CLEANFILES += \
@@ -83,12 +81,17 @@ CLEANFILES += \
 EXTRA_DIST += \
         app.gresource.xml \
        app.ui \
+       app.vala \
+       config.vapi \
        search-popover.ui \
        $(NULL)
 
 appresources.c: app.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir $(srcdir) $(srcdir)/app.gresource.xml)
        $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate 
--c-name app $<
 
+app.c: $(srcdir)/app.vala $(srcdir)/config.vapi vte-$(VTE_API_VERSION).vapi Makefile
+       $(AM_V_GEN)$(VALAC) $(app_valaflags) -C $(srcdir)/app.vala $(srcdir)/config.vapi 
vte-$(VTE_API_VERSION).vapi
+
 .DELETE_ON_ERROR:
 
 include $(VAPIGEN_MAKEFILE)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]