[gvfs] build: Fix EXTRA_DIST and CLEANFILES

[Ondrej Holy <oholy src gnome org>]

commit 6bdc893d4cb80ffb108f27313077c106c52e6930
Author: Ondrej Holy <oholy redhat com>
Date:   Mon Oct 24 18:34:36 2016 +0200

    build: Fix EXTRA_DIST and CLEANFILES
    
    Fix some issues which breakes "make dist".

 man/Makefile.am      |   34 +++++++++++++++++++++++++++++-----
 programs/Makefile.am |   27 ++++++++++++++++++++++++---
 2 files changed, 53 insertions(+), 8 deletions(-)
---
diff --git a/man/Makefile.am b/man/Makefile.am
index fa3a563..2488925 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -87,8 +87,32 @@ man_MANS = \
        gvfsd-fuse.1 \
        gvfsd-metadata.1
 
-xml_files = ${patsubst %.1,%.xml,${patsubst %.7,%.xml,$(man_MANS)}}
-
-EXTRA_DIST = $(xml_files)
-
-CLEANFILES = $(man_MANS)
+EXTRA_DIST = \
+       deprecated.xml.in \
+       gvfsd-fuse.xml \
+       gvfsd-metadata.xml \
+       gvfsd.xml \
+       gvfs-less.xml \
+       gvfs.xml \
+       $(NULL)
+
+CLEANFILES = \
+       $(man_MANS) \
+       gvfs-cat.xml \
+       gvfs-copy.xml \
+       gvfs-info.xml \
+       gvfs-ls.xml \
+       gvfs-mime.xml \
+       gvfs-mkdir.xml \
+       gvfs-monitor-dir.xml \
+       gvfs-monitor-file.xml \
+       gvfs-mount.xml \
+       gvfs-move.xml \
+       gvfs-open.xml \
+       gvfs-rename.xml \
+       gvfs-rm.xml \
+       gvfs-save.xml \
+       gvfs-set-attribute.xml \
+       gvfs-trash.xml \
+       gvfs-tree.xml \
+       $(NULL)
diff --git a/programs/Makefile.am b/programs/Makefile.am
index d69734b..254a7d4 100644
--- a/programs/Makefile.am
+++ b/programs/Makefile.am
@@ -1,7 +1,5 @@
 NULL =
 
-bin_in_files = program.in
-
 bin_SCRIPTS =                                  \
        gvfs-mount                              \
        gvfs-cat                                \
@@ -74,4 +72,27 @@ gvfs-mkdir: deprecated.in Makefile
 gvfs-mime: deprecated.in Makefile
        $(AM_V_GEN) $(SED) -e "s|\@replacement\@|gio mime|" $< > $@
 
-EXTRA_DIST = $(bin_in_files)
+EXTRA_DIST = \
+       deprecated.in \
+       gvfs-less \
+       $(NULL)
+
+CLEANFILES = \
+       gvfs-mount \
+       gvfs-cat \
+       gvfs-open \
+       gvfs-save \
+       gvfs-ls \
+       gvfs-tree \
+       gvfs-info \
+       gvfs-set-attribute \
+       gvfs-trash \
+       gvfs-rename \
+       gvfs-rm \
+       gvfs-copy \
+       gvfs-move \
+       gvfs-monitor-file \
+       gvfs-monitor-dir \
+       gvfs-mkdir \
+       gvfs-mime \
+       $(NULL)