diff options
author | David King <amigadave@amigadave.com> | 2015-10-20 12:55:14 +0200 |
---|---|---|
committer | David King <amigadave@amigadave.com> | 2015-10-20 12:55:14 +0200 |
commit | ea6d834044c014b29a2b6c25e3fdb236d91dcd11 (patch) | |
tree | 9963206b8cc00de79d15c0ffc723de446f40b0e7 | |
parent | 161c9c4de6e9a410f84fcdcaf6e497253cef7575 (diff) | |
download | yelp-ea6d834044c014b29a2b6c25e3fdb236d91dcd11.tar.gz |
Convert data/domains subdir to non-recursive make
-rw-r--r-- | Makefile.am | 20 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | data/Makefile.am | 2 | ||||
-rw-r--r-- | data/domains/Makefile.am | 18 |
4 files changed, 20 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index b29acb4e..b89de832 100644 --- a/Makefile.am +++ b/Makefile.am @@ -126,6 +126,21 @@ dist_scalableicon_DATA = \ data/icons/hicolor/scalable/status/yelp-page-video-symbolic.svg \ data/icons/hicolor/scalable/status/yelp-page-symbolic.svg +domaindir = $(datadir)/yelp-xsl/xslt/common/domains + +data/domains/yelp.pot: data/domains/yelp.xml.in + $(ITSTOOL) -o "$@" "$^" + +data/domains/yelp.xml: data/domains/yelp.xml.in + $(AM_V_GEN) ( \ + for lang in $(ALL_LINGUAS); do \ + msgfmt -o "$$lang.mo" "$(top_srcdir)/po/$$lang.po" || exit 1; \ + done; \ + $(ITSTOOL) -o "$@" -j "$^" $(foreach ll,$(ALL_LINGUAS),$(ll).mo); \ + rm $(foreach ll,$(ALL_LINGUAS),$(ll).mo)) + +domain_DATA = data/domains/yelp.xml + xsldir = $(pkgdatadir)/xslt xsl_DATA = \ @@ -138,7 +153,10 @@ xsl_DATA = \ dist_noinst_DATA = \ $(desktop_in_files) \ $(gsettings_SCHEMAS) \ - $(yelp_headers) + $(yelp_headers) \ + data/domains/yelp.pot \ + data/domains/yelp.xml.in \ + data/domains/yelp.xml dist_noinst_SCRIPTS = \ autogen.sh diff --git a/configure.ac b/configure.ac index 56cda570..8a97db1e 100644 --- a/configure.ac +++ b/configure.ac @@ -157,7 +157,6 @@ docs/libyelp/Makefile docs/libyelp/version.xml libyelp/Makefile data/Makefile -data/domains/Makefile data/dtd/Makefile data/dtd/catalog data/mathjax/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index ed2953ee..ff043d02 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1 +1 @@ -SUBDIRS = domains dtd mathjax +SUBDIRS = dtd mathjax diff --git a/data/domains/Makefile.am b/data/domains/Makefile.am deleted file mode 100644 index 8e57da5b..00000000 --- a/data/domains/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -ALL_LINGUAS = @ALL_LINGUAS@ - -yelp.pot: yelp.xml.in - itstool -o "$@" "$^" - -yelp.xml: yelp.xml.in - $(AM_V_GEN) ( \ - for lang in $(ALL_LINGUAS); do \ - msgfmt -o "$$lang.mo" "$(top_srcdir)/po/$$lang.po" || exit 1; \ - done; \ - itstool -o "$@" -j "$^" $(foreach ll,$(ALL_LINGUAS),$(ll).mo); \ - rm $(foreach ll,$(ALL_LINGUAS),$(ll).mo)) - -xsldir=$(datadir)/yelp-xsl/xslt/common/domains - -xsl_DATA = yelp.xml - -dist_noinst_DATA = yelp.xml.in yelp.xml yelp.pot |