From d3170ed2021af8a8c5ef01b09dca0fd0dd71da7c Mon Sep 17 00:00:00 2001 From: Daniel Espinosa Date: Fri, 2 Mar 2018 09:46:58 -0600 Subject: [PATCH] Adding gxml.deps.in in distribution tar Fix Issue: https://gitlab.gnome.org/GNOME/gxml/issues/2 --- configure.ac | 3 ++- gxml/Makefile.am | 8 +++----- gxml/gxml.deps.in | 4 +++- gxml/meson.build | 1 - 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index db49281d..68c2ad7f 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ # Release Version for API related changes m4_define([project_major_version], [0]) m4_define([project_minor_version], [16]) -m4_define([project_micro_version], [2]) +m4_define([project_micro_version], [3]) m4_define([project_nano_version], [0]) # LT_VERSION for ABI related changes @@ -257,6 +257,7 @@ AC_CONFIG_FILES([ Makefile gxml/namespace-info.vala gxml/gxml-$API_VERSION.pc:gxml/gxml.pc.in +gxml/gxml-$API_VERSION.deps:gxml/gxml.deps.in gxml/Makefile test/Makefile examples/Makefile diff --git a/gxml/Makefile.am b/gxml/Makefile.am index 9fac86e3..2117373a 100644 --- a/gxml/Makefile.am +++ b/gxml/Makefile.am @@ -194,11 +194,6 @@ libgxml_0_16_la_SOURCES= \ xlibxml.c \ $(NULL) -gxml-$(API_VERSION).deps: - echo 'libxml-2.0' > $@ - echo 'gee-0.8' >> $@ - echo 'gio-2.0' >> $@ - # .h header file gxml.h: libgxml-$(API_VERSION).la gxmldir= $(includedir)/gxml-$(API_VERSION)/gxml @@ -221,6 +216,9 @@ EXTRA_DIST = \ $(pkgconfig_in) \ $(NULL) +DISTCLEANFILES= \ + gxml-$(API_VERSION).deps + # This makes GObject Introspection optional and requires to use --enable-instrospection switch on configure if HAVE_INTROSPECTION diff --git a/gxml/gxml.deps.in b/gxml/gxml.deps.in index ff7dc3f9..1cef7f7b 100644 --- a/gxml/gxml.deps.in +++ b/gxml/gxml.deps.in @@ -1 +1,3 @@ -@VALADEPS@ +gio-2.0 +gee-0.8 +libxml-2.0 diff --git a/gxml/meson.build b/gxml/meson.build index 421f6aa6..e4482239 100644 --- a/gxml/meson.build +++ b/gxml/meson.build @@ -6,7 +6,6 @@ VAPI_NAME = VERSIONED_PROJECT_NAME+'.vapi' conf = configuration_data() conf.set('prefix', get_option('prefix')) conf.set('libdir', '${exec_prefix}/'+get_option ('libdir')) -conf.set('VALADEPS', VALADEPS) conf.set('PCDEPS', PCDEPS) conf.set('PROJECT_NAME', PROJECT_NAME) conf.set('PROJECT_VERSION', PROJECT_VERSION) -- GitLab