[gtk-vnc] Add missing vala .deps files for gvnc & gvncpulse



commit d86c26ac57eda8dd99f8864e8685ff4400ac0d6c
Author: Rico Tzschichholz <ricotz t-online de>
Date:   Wed Feb 8 12:12:01 2017 +0000

    Add missing vala .deps files for gvnc & gvncpulse
    
    https://bugzilla.gnome.org/show_bug.cgi?id=772322
    
    Signed-off-by: Daniel P. Berrange <berrange redhat com>

 gtk-vnc.spec.in  |    2 ++
 src/Makefile.am  |    4 ++--
 vapi/Makefile.am |   12 +++++++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/gtk-vnc.spec.in b/gtk-vnc.spec.in
index cd149d9..c6ff78e 100644
--- a/gtk-vnc.spec.in
+++ b/gtk-vnc.spec.in
@@ -255,6 +255,7 @@ rm -fr %{buildroot}
 %{_libdir}/girepository-1.0/GVnc-1.0.typelib
 %endif
 %if %{with_vala}
+%{_datadir}/vala/vapi/gvnc-1.0.deps
 %{_datadir}/vala/vapi/gvnc-1.0.vapi
 %endif
 
@@ -275,6 +276,7 @@ rm -fr %{buildroot}
 %{_libdir}/girepository-1.0/GVncPulse-1.0.typelib
 %endif
 %if %{with_vala}
+%{_datadir}/vala/vapi/gvncpulse-1.0.deps
 %{_datadir}/vala/vapi/gvncpulse-1.0.vapi
 %endif
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f7c1d9d..50b859b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -317,7 +317,7 @@ BUILT_SOURCES += $(MARSHAL_FILES) $(ENUM_FILES)
 CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES)
 
 vncconnectiontest_SOURCES = vncconnectiontest.c
-vncconnectiontest_CFLAGS = $(GOBJECT_CFLAGS)
+vncconnectiontest_CFLAGS = $(GOBJECT_CFLAGS) $(GIO_LIBS)
 vncconnectiontest_LDADD = libgvnc-1.0.la
 
 if WITH_PYTHON
@@ -403,7 +403,7 @@ if HAVE_PULSEAUDIO
 GVncPulse-1.0.gir: libgvncpulse-1.0.la GVnc-1.0.gir
 GVncPulse_1_0_gir_INCLUDES = GObject-2.0
 GVncPulse_1_0_gir_PACKAGES = gobject-2.0 libpulse-simple
-GVncPulse_1_0_gir_EXPORT_PACKAGES = gvnc-1.0
+GVncPulse_1_0_gir_EXPORT_PACKAGES = gvncpulse-1.0
 GVncPulse_1_0_gir_LIBS = libgvnc-1.0.la libgvncpulse-1.0.la
 GVncPulse_1_0_gir_FILES = $(GVNCPULSE_INTROSPECTION_SRCS)
 GVncPulse_1_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) $(libgvncpulse_1_0_la_CFLAGS) -I$(srcdir)
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 40e070d..c306217 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -5,12 +5,15 @@ vapidir = $(datadir)/vala/vapi
 vapi_DATA =                                    \
        gtk-vnc-$(GTK_VNC_API_VERSION).deps     \
        gtk-vnc-$(GTK_VNC_API_VERSION).vapi     \
+       gvnc-1.0.deps                           \
        gvnc-1.0.vapi                           \
        $(NULL)
 
 if HAVE_PULSEAUDIO
 vapi_DATA += \
-       gvncpulse-1.0.vapi
+       gvncpulse-1.0.deps                      \
+       gvncpulse-1.0.vapi                      \
+       $(NULL)
 endif
 
 gvnc-1.0.vapi: $(top_builddir)/src/GVnc-1.0.gir
@@ -20,6 +23,9 @@ gvnc-1.0.vapi: $(top_builddir)/src/GVnc-1.0.gir
                --library gvnc-1.0              \
                $<
 
+gvnc-1.0.deps: gvnc-1.0.vapi
+       @echo "gio-2.0" > $@
+
 if HAVE_PULSEAUDIO
 gvncpulse-1.0.vapi: $(top_builddir)/src/GVncPulse-1.0.gir gvnc-1.0.vapi
        $(AM_V_GEN)$(VAPIGEN)                   \
@@ -30,6 +36,10 @@ gvncpulse-1.0.vapi: $(top_builddir)/src/GVncPulse-1.0.gir gvnc-1.0.vapi
                --library gvncpulse-1.0         \
                --girdir=$(top_builddir)/src    \
                $<
+
+gvncpulse-1.0.deps: gvnc-1.0.vapi
+       @echo "gio-2.0" > $@
+       @echo "gvnc-1.0" >> $@
 endif
 
 gtk-vnc-$(GTK_VNC_API_VERSION).vapi: $(top_builddir)/src/GtkVnc-$(GTK_VNC_API_VERSION).gir gvnc-1.0.vapi


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