diff options
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | capplets/about-me/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/accessibility/at-properties/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/appearance/data/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/default-applications/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/display/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/keybindings/Makefile.am | 4 | ||||
| -rw-r--r-- | capplets/mouse/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/network/Makefile.am | 2 | ||||
| -rw-r--r-- | gla11y.mk | 14 |
10 files changed, 28 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 76a0007b..eba49123 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,6 +65,7 @@ requires: archlinux: # Useful URL: https://git.archlinux.org/svntogit/community.git/tree/mate-control-center - clang + - file - gcc - git - gobject-introspection @@ -118,6 +119,7 @@ requires: - make - mate-common - mate-settings-daemon-dev + - python-lxml - shared-mime-info - xsltproc - yelp-tools @@ -147,6 +149,7 @@ requires: - make - marco-devel - polkit-devel + - python-lxml - mate-common - mate-settings-daemon-devel - redhat-rpm-config @@ -189,6 +192,7 @@ requires: - make - mate-common - mate-settings-daemon-dev + - python-lxml - shared-mime-info - xsltproc - yelp-tools @@ -262,6 +266,8 @@ before_scripts: - fi - make - make install + - curl -Ls -o /usr/bin/gla11y https://github.com/hypra/gla11y/raw/v0.2/gla11y + - chmod +x /usr/bin/gla11y build_scripts: - ./autogen.sh diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am index d5fd158b..8a872e7a 100644 --- a/capplets/about-me/Makefile.am +++ b/capplets/about-me/Makefile.am @@ -52,7 +52,7 @@ AM_CPPFLAGS += \ $(ACCOUNTSSERVICE_CFLAGS) endif -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) EXTRA_DIST = \ $(ui_files) \ fprintd-marshal.list \ diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am index ea710733..c1c06848 100644 --- a/capplets/accessibility/at-properties/Makefile.am +++ b/capplets/accessibility/at-properties/Makefile.am @@ -28,7 +28,7 @@ AM_CPPFLAGS = $(AT_CAPPLET_CFLAGS) \ $(MATECC_CAPPLETS_CFLAGS) \ -DPIXMAPDIR=\""$(pixmapdir)"\" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) EXTRA_DIST = \ $(ui_files) \ $(pixmap_DATA) \ diff --git a/capplets/appearance/data/Makefile.am b/capplets/appearance/data/Makefile.am index a3849ba2..4941da96 100644 --- a/capplets/appearance/data/Makefile.am +++ b/capplets/appearance/data/Makefile.am @@ -49,6 +49,6 @@ EXTRA_DIST = \ $(desktop_in_files) \ ui-a11y.suppr -CLEANFILES = $(desktop_DATA) $(mime_DATA) $(GLA11Y_OUTPUT) +CLEANFILES = $(desktop_DATA) $(mime_DATA) -include $(top_srcdir)/git.mk diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am index efeb778e..a8d21f8b 100644 --- a/capplets/default-applications/Makefile.am +++ b/capplets/default-applications/Makefile.am @@ -36,7 +36,7 @@ AM_CPPFLAGS = \ mate-default-applications-properties-resources.h mate-default-applications-properties-resources.c: org.mate.mcc.da.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.da.gresource.xml) $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name default_applications $< -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(autostart_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(autostart_DATA) $(BUILT_SOURCES) EXTRA_DIST = \ mate-default-applications.pc.in \ mate-default-applications-properties.ui \ diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am index 0b776e70..058e206d 100644 --- a/capplets/display/Makefile.am +++ b/capplets/display/Makefile.am @@ -60,7 +60,7 @@ foo-marshal.h: foo-marshal.list mate-display-properties-resources.h mate-display-properties-resources.c: org.mate.mcc.display.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.display.gresource.xml) $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name display $< -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) EXTRA_DIST = $(ui_files) foo-marshal.list $(Desktop_in_files) org.mate.mcc.display.gresource.xml org.mate.randr.policy.in ui-a11y.suppr DISTCLEANFILES = org.mate.randr.policy diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am index 48d8435b..022e006f 100644 --- a/capplets/keybindings/Makefile.am +++ b/capplets/keybindings/Makefile.am @@ -43,8 +43,8 @@ CLEANFILES = \ $(BUILT_SOURCES) \ $(MATECC_CAPPLETS_CLEANFILES) \ $(desktop_DATA) \ - $(xml_DATA) \ - $(GLA11Y_OUTPUT) + $(xml_DATA) + EXTRA_DIST = $(xml_in_files) \ mate-keybindings.pc.in \ $(ui_files) \ diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index 7a3bb4b1..8ba2fd12 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -28,7 +28,7 @@ mate-mouse-properties-resources.h mate-mouse-properties-resources.c: org.mate.mc AM_CPPFLAGS = \ $(MATECC_CAPPLETS_CFLAGS) \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) EXTRA_DIST = \ $(ui_files) \ double-click-on.svg \ diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am index 17616ece..7ac02281 100644 --- a/capplets/network/Makefile.am +++ b/capplets/network/Makefile.am @@ -25,7 +25,7 @@ mate-network-properties-resources.h mate-network-properties-resources.c: org.mat AM_CPPFLAGS = \ $(MATECC_CAPPLETS_CFLAGS) -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) EXTRA_DIST = $(ui_files) $(desktop_in_files) org.mate.mcc.network.gresource.xml ui-a11y.suppr -include $(top_srcdir)/git.mk @@ -2,6 +2,18 @@ GLA11Y_OUTPUT = ui-a11y.err GLA11Y_SUPPR = ui-a11y.suppr GLA11Y_FALSE = ui-a11y.false +a11y_verbose = $(a11y_verbose_@AM_V@) +a11y_verbose_ = $(a11y_verbose_@AM_DEFAULT_V@) +a11y_verbose_0 = @echo " A11Y " $@; +a11y_verbose_1 = + + all-local: $(GLA11Y_OUTPUT) $(GLA11Y_OUTPUT): $(ui_files) - $(GLA11Y) -P $(srcdir)/ -f $(srcdir)/$(GLA11Y_FALSE) -s $(srcdir)/$(GLA11Y_SUPPR) -o $@ $(ui_files:%=$(srcdir)/%) + $(a11y_verbose) $(GLA11Y) -P $(srcdir)/ -f $(srcdir)/$(GLA11Y_FALSE) -s $(srcdir)/$(GLA11Y_SUPPR) -o $@ $(ui_files:%=$(srcdir)/%) + +clean-local: clean-local-check +clean-local-check: + -rm -f $(GLA11Y_OUTPUT) + +.PHONY: clean-local-check |