From c82fa201fd169d3847ffcefadc9e046475bd5e3a Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Sat, 10 Jan 2015 19:31:26 +0100
Subject: fix dist for extension ini files

---
 gksu/Makefile.am            |  4 ++++
 image-converter/Makefile.am |  4 +++-
 open-terminal/Makefile.am   |  3 +++
 sendto/Makefile.am          | 15 +++++++++++++--
 share/Makefile.am           |  5 ++++-
 wallpaper/Makefile.am       |  4 ++++
 6 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/gksu/Makefile.am b/gksu/Makefile.am
index 57f62c5..e2de4b0 100644
--- a/gksu/Makefile.am
+++ b/gksu/Makefile.am
@@ -11,3 +11,7 @@ extensiondir = $(datadir)/caja/extensions
 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 5209912..d5944e5 100644
--- a/image-converter/Makefile.am
+++ b/image-converter/Makefile.am
@@ -32,4 +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)
+EXTRA_DIST = $(builder_DATA) $(extension_in_files)
+
+CLEANFILES = $(extension_DATA)
diff --git a/open-terminal/Makefile.am b/open-terminal/Makefile.am
index ac45c5d..c64d071 100644
--- a/open-terminal/Makefile.am
+++ b/open-terminal/Makefile.am
@@ -39,6 +39,9 @@ extension_DATA = $(extension_in_files:.caja-extension.in=.caja-extension)
 DISTCLEANFILES = \
 	org.mate.caja-open-terminal.gschema.xml
 
+CLEANFILES = $(extension_DATA)
+
 EXTRA_DIST = \
 	$(convert_DATA) \
+	$(extension_in_files) \
 	$(gsettings_schemas_in_files)
diff --git a/sendto/Makefile.am b/sendto/Makefile.am
index c7a241a..3bee8dd 100644
--- a/sendto/Makefile.am
+++ b/sendto/Makefile.am
@@ -83,5 +83,16 @@ extension_in_files = libcaja-sendto.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 = $(ui_DATA) $(man_MANS) caja-sendto.pc.in $(convert_DATA) $(gsettingsschema_in_files)
-CLEANFILES = $(nst_built_headers) $(nst_built_cfiles) $(gsettings_SCHEMAS)
+EXTRA_DIST = \
+	$(ui_DATA) \
+	$(man_MANS) \
+	caja-sendto.pc.in \
+	$(convert_DATA) \
+	$(gsettingsschema_in_files) \
+	$(extension_in_files)
+
+CLEANFILES = \
+	$(nst_built_headers) \
+	$(nst_built_cfiles) \
+	$(gsettings_SCHEMAS) \
+	$(extension_DATA)
diff --git a/share/Makefile.am b/share/Makefile.am
index d4ddc96..118307d 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,6 +1,5 @@
 interfacesdir = $(datadir)/caja-extensions
 interfaces_DATA = share-dialog.ui
-EXTRA_DIST = share-dialog.ui
 
 libcaja_share_la_CFLAGS =				\
 	-Wall						\
@@ -31,3 +30,7 @@ extensiondir = $(datadir)/caja/extensions
 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
+
+CLEANFILES = $(extension_DATA)
diff --git a/wallpaper/Makefile.am b/wallpaper/Makefile.am
index bca84d2..ccfa606 100644
--- a/wallpaper/Makefile.am
+++ b/wallpaper/Makefile.am
@@ -15,3 +15,7 @@ extensiondir = $(datadir)/caja/extensions
 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