diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | capplets/default-applications/Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | font-viewer/Makefile.am | 2 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 | ||||
| -rw-r--r-- | po/POTFILES.skip | 2 |
6 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 56dd2d30..3c5145f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,9 +55,9 @@ MAINTAINERCLEANFILES = \ `find "$(srcdir)" -type f -name Makefile.in -print` EXTRA_DIST = \ - $(gsettings_schemas_in_in) \ + org.mate.control-center.gschema.xml.in.in \ + org.mate.control-center.keybinding.gschema.xml.in.in \ $(convert_DATA) \ - MAINTAINERS \ mate-doc-utils.make DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am index b0e855d9..71a2d1db 100644 --- a/capplets/default-applications/Makefile.am +++ b/capplets/default-applications/Makefile.am @@ -15,7 +15,7 @@ uidir = $(pkgdatadir)/ui dist_ui_DATA = mate-default-applications-properties.ui desktopdir = $(datadir)/applications -Desktop_in_files = mate-default-applications.desktop.in +Desktop_in_files = mate-default-applications-properties.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) pkgconfigdir = $(libdir)/pkgconfig @@ -28,6 +28,6 @@ AM_CPPFLAGS = \ -DMATECC_UI_DIR=\""$(uidir)"\" CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(autostart_DATA) -EXTRA_DIST = mate-default-applications.pc.in ($man_MANS) +EXTRA_DIST = mate-default-applications.pc.in mate-default-applications-properties.desktop.in.in $(man_MANS) -include $(top_srcdir)/git.mk diff --git a/configure.ac b/configure.ac index c99d76d2..b517f898 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([shell]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 tar-ustar]) +AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar]) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) diff --git a/font-viewer/Makefile.am b/font-viewer/Makefile.am index 8ea64917..130a9016 100644 --- a/font-viewer/Makefile.am +++ b/font-viewer/Makefile.am @@ -33,7 +33,7 @@ CLEANFILES = $(desktop_in_files) $(desktop_DATA) \ $(schemas_DATA) $(directory_DATA) EXTRA_DIST = \ - fontilus.schemas.in \ + $(thumbnailer_DATA) \ mate-font-viewer.desktop.in.in -include $(top_srcdir)/git.mk diff --git a/po/POTFILES.in b/po/POTFILES.in index 7a653d91..5a55258a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -34,7 +34,7 @@ capplets/common/capplet-stock-icons.c capplets/common/capplet-util.c capplets/common/file-transfer-dialog.c capplets/common/mate-theme-info.c -capplets/default-applications/default-applications.desktop.in.in +capplets/default-applications/mate-default-applications-properties.desktop.in.in capplets/default-applications/mate-da-capplet.c [type: gettext/glade]capplets/default-applications/mate-default-applications-properties.ui [type: gettext/glade]capplets/display/display-capplet.ui @@ -84,5 +84,7 @@ font-viewer/font-thumbnailer.c libslab/app-shell.c libslab/application-tile.c libslab/bookmark-agent.c +libslab/directory-tile.c +libslab/document-tile.c libslab/search-bar.c libslab/system-tile.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 09d70141..454fa4e8 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -5,7 +5,7 @@ capplets/accessibility/keyboard/accessibility-keyboard.desktop.in capplets/appearance/data/mate-appearance-properties.desktop.in capplets/appearance/data/mate-theme-installer.desktop.in capplets/appearance/data/mate-theme-package.xml -capplets/default-applications/default-applications.desktop.in +capplets/default-applications/mate-default-applications-properties.desktop.in capplets/default-applications/mate-at-session.desktop.in capplets/display/display-properties.desktop.in capplets/keybindings/mate-keybinding.desktop.in |