diff options
| author | Christian Persch <chpe@gnome.org> | 2014-09-13 10:10:17 +0200 |
|---|---|---|
| committer | Christian Persch <chpe@gnome.org> | 2014-09-13 10:10:17 +0200 |
| commit | c6354c469d03fa21fa768d8922ddb439703fe20e (patch) | |
| tree | d02b81a2c10f873f3b5adf9c4d0ff8e25c401be8 | |
| parent | 955a2ffadc81d1e4943dc28af7796dae5d37110b (diff) | |
| download | vte-c6354c469d03fa21fa768d8922ddb439703fe20e.tar.gz | |
glade: Make catalogue parallel-installable with vte 2.90
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | glade/Makefile.am | 5 | ||||
| -rw-r--r-- | glade/vte.xml.in.in | 8 |
3 files changed, 9 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index c650e123..4a84f782 100644 --- a/configure.ac +++ b/configure.ac @@ -358,10 +358,10 @@ doc/openi18n/Makefile doc/reference/Makefile doc/reference/version.xml glade/Makefile -glade/vte.xml.in ]) AC_CONFIG_FILES([vte-${VTE_API_VERSION}.pc:vte.pc.in],[VTE_API_VERSION=${VTE_API_VERSION}]) +AC_CONFIG_FILES([glade/vte-${VTE_API_VERSION}.xml.in:glade/vte.xml.in.in],[VTE_API_VERSION=${VTE_API_VERSION}]) AC_OUTPUT diff --git a/glade/Makefile.am b/glade/Makefile.am index 372652a9..9f1db5b5 100644 --- a/glade/Makefile.am +++ b/glade/Makefile.am @@ -1,8 +1,7 @@ NULL = cataloguedir = $(GLADE_CATALOGUE_DIR) -catalogue_in_files = vte.xml.in.in -catalogue_DATA = $(catalogue_in_files:.xml.in.in=.xml) +nodist_catalogue_DATA = vte-$(VTE_API_VERSION).xml icons = \ hicolor_actions_16x16_widget-vte-terminal.png \ @@ -39,8 +38,6 @@ install-data-local: install-icons uninstall-local: uninstall-icons -MAINTAINERCLEANFILES = $(catalogue_DATA) - @INTLTOOL_XML_NOMERGE_RULE@ -include $(top_srcdir)/git.mk diff --git a/glade/vte.xml.in.in b/glade/vte.xml.in.in index 626e5bfd..26c823a2 100644 --- a/glade/vte.xml.in.in +++ b/glade/vte.xml.in.in @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<glade-catalog name="vte" library="vte-@VTE_API_VERSION@" domain="vte-@VTE_API_VERSION@" depends="gtk+" book="vte" supports="gtkbuilder"> +<glade-catalog name="vte-@VTE_API_VERSION@" + version="@VERSION@" + library="vte-@VTE_API_VERSION@" + domain="vte-@VTE_API_VERSION@" + depends="gtk+" + book="vte" + supports="gtkbuilder"> <glade-widget-classes> <glade-widget-class title="VTE Terminal" name="VteTerminal" generic-name="terminal"> <properties> |