From eafb5fddf84324ebf6b0cc90422f10ee314b5b28 Mon Sep 17 00:00:00 2001 From: rbuj Date: Tue, 7 May 2019 00:05:26 +0200 Subject: capplets: Use gresources for UI files --- capplets/mouse/Makefile.am | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'capplets/mouse/Makefile.am') diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index 1cfc2f1f..158806a4 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -4,6 +4,9 @@ cappletname = mouse bin_PROGRAMS = mate-mouse-properties mate_mouse_properties_LDADD = $(MATECC_CAPPLETS_LIBS) +BUILT_SOURCES = mate-mouse-properties-resources.h mate-mouse-properties-resources.c +nodist_mate_mouse_properties_SOURCES = \ + $(BUILT_SOURCES) mate_mouse_properties_SOURCES = \ mate-mouse-properties.c \ msd-input-helper.c \ @@ -17,19 +20,18 @@ pixmap_DATA = \ double-click-off.svg \ double-click-maybe.svg -uidir = $(pkgdatadir)/ui -ui_DATA = mate-mouse-properties.ui - desktopdir = $(datadir)/applications Desktop_in_files = mate-settings-mouse.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) +mate-mouse-properties-resources.h mate-mouse-properties-resources.c: org.mate.mcc.mouse.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.mouse.gresource.xml) + $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name mouse $< + AM_CPPFLAGS = \ $(MATECC_CAPPLETS_CFLAGS) \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ - -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ - -DMATECC_UI_DIR="\"$(uidir)\"" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) -EXTRA_DIST = $(ui_DATA) $(pixmap_DATA) $(Desktop_in_files) + -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) +EXTRA_DIST = mate-mouse-properties.ui $(pixmap_DATA) $(Desktop_in_files) org.mate.mcc.mouse.gresource.xml -include $(top_srcdir)/git.mk -- cgit v1.2.1