From b28ea563892bcf8d708ad92cb10783c847c5e496 Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 10 Jan 2015 19:55:11 +0100 Subject: Update POTFILES.in with renamed extension files So we do not have to add *.caja-extension.in to extra dist --- gksu/Makefile.am | 2 -- image-converter/Makefile.am | 2 +- open-terminal/Makefile.am | 1 - po/POTFILES.in | 12 ++++++------ sendto/Makefile.am | 3 +-- share/Makefile.am | 2 +- wallpaper/Makefile.am | 2 -- 7 files changed, 9 insertions(+), 15 deletions(-) diff --git a/gksu/Makefile.am b/gksu/Makefile.am index e2de4b0..b67de52 100644 --- a/gksu/Makefile.am +++ b/gksu/Makefile.am @@ -12,6 +12,4 @@ extension_in_files = libcaja-gksu.caja-extension.in extension_DATA = $(extension_in_files:.caja-extension.in=.caja-extension) %.caja-extension: %.caja-extension.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -EXTRA_DIST = $(extension_in_files) - CLEANFILES = $(extension_DATA) diff --git a/image-converter/Makefile.am b/image-converter/Makefile.am index d5944e5..33a736d 100644 --- a/image-converter/Makefile.am +++ b/image-converter/Makefile.am @@ -32,6 +32,6 @@ extension_in_files = libcaja-image-converter.caja-extension.in extension_DATA = $(extension_in_files:.caja-extension.in=.caja-extension) %.caja-extension: %.caja-extension.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -EXTRA_DIST = $(builder_DATA) $(extension_in_files) +EXTRA_DIST = $(builder_DATA) CLEANFILES = $(extension_DATA) diff --git a/open-terminal/Makefile.am b/open-terminal/Makefile.am index c64d071..7dd78a3 100644 --- a/open-terminal/Makefile.am +++ b/open-terminal/Makefile.am @@ -43,5 +43,4 @@ CLEANFILES = $(extension_DATA) EXTRA_DIST = \ $(convert_DATA) \ - $(extension_in_files) \ $(gsettings_schemas_in_files) diff --git a/po/POTFILES.in b/po/POTFILES.in index 5565d4e..aa0e5f5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,21 +1,21 @@ # List of source files containing translatable strings. # Please keep this list in alphabetic order. gksu/libcaja-gksu.c -[type: gettext/ini]gksu/libcaja-gksu.caja-extension.in +[type: gettext/ini]gksu/libcaja-gksu.caja-extension.in.in image-converter/caja-image-converter.c [type: gettext/glade]image-converter/caja-image-resize.ui image-converter/caja-image-resizer.c [type: gettext/glade]image-converter/caja-image-rotate.ui image-converter/caja-image-rotator.c -[type: gettext/ini]image-converter/libcaja-image-converter.caja-extension.in +[type: gettext/ini]image-converter/libcaja-image-converter.caja-extension.in.in open-terminal/caja-open-terminal.c -[type: gettext/ini]open-terminal/libcaja-open-terminal.caja-extension.in +[type: gettext/ini]open-terminal/libcaja-open-terminal.caja-extension.in.in open-terminal/org.mate.caja-open-terminal.gschema.xml.in sendto/caja-nste.c sendto/caja-nste.h sendto/caja-sendto-command.c sendto/caja-sendto-module.c -[type: gettext/ini]sendto/libcaja-sendto.caja-extension.in +[type: gettext/ini]sendto/libcaja-sendto.caja-extension.in.in sendto/org.mate.Caja.Sendto.gschema.xml.in [type: gettext/glade]sendto/caja-sendto.ui sendto/plugins/emailclient/emailclient.c @@ -24,9 +24,9 @@ sendto/plugins/caja-burn/caja-burn.c sendto/plugins/pidgin/pidgin.c sendto/plugins/removable-devices/removable-devices.c sendto/plugins/upnp/upnp.c -[type: gettext/ini]share/libcaja-share.caja-extension.in +[type: gettext/ini]share/libcaja-share.caja-extension.in.in share/mate-file-manager-share.c [type: gettext/glade]share/share-dialog.ui share/shares.c wallpaper/caja-wallpaper-extension.c -[type: gettext/ini]wallpaper/libcaja-wallpaper.caja-extension.in +[type: gettext/ini]wallpaper/libcaja-wallpaper.caja-extension.in.in diff --git a/sendto/Makefile.am b/sendto/Makefile.am index 3bee8dd..68a169c 100644 --- a/sendto/Makefile.am +++ b/sendto/Makefile.am @@ -88,8 +88,7 @@ EXTRA_DIST = \ $(man_MANS) \ caja-sendto.pc.in \ $(convert_DATA) \ - $(gsettingsschema_in_files) \ - $(extension_in_files) + $(gsettingsschema_in_files) CLEANFILES = \ $(nst_built_headers) \ diff --git a/share/Makefile.am b/share/Makefile.am index 118307d..036119e 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -31,6 +31,6 @@ extension_in_files = libcaja-share.caja-extension.in extension_DATA = $(extension_in_files:.caja-extension.in=.caja-extension) %.caja-extension: %.caja-extension.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -EXTRA_DIST = $(extension_in_files) share-dialog.ui +EXTRA_DIST = share-dialog.ui CLEANFILES = $(extension_DATA) diff --git a/wallpaper/Makefile.am b/wallpaper/Makefile.am index ccfa606..0796412 100644 --- a/wallpaper/Makefile.am +++ b/wallpaper/Makefile.am @@ -16,6 +16,4 @@ extension_in_files = libcaja-wallpaper.caja-extension.in extension_DATA = $(extension_in_files:.caja-extension.in=.caja-extension) %.caja-extension: %.caja-extension.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -EXTRA_DIST = $(extension_in_files) - CLEANFILES = $(extension_DATA) -- cgit v1.2.1