* doc/Makefile.am: Remove unneeded CLEANFILES, they're defined below.

* doc/xmldocs.make: Add Makefile to CLEANFILES; Explictly clean
stuff in distclean-hook.
* src/Makefile.am: Remove gramps.desktop from GRAPHICS.
* src/data/Makefile.am: Remove EXTRA_DIST; split files that do not
need to be in $PREFIX/share/gramps into dist_data_DATA: they're
installed explicitly to the proper locations anyway, and this is
only needed for distribution.


svn: r3782

doc/xmldocs.make

@@ -43,7 +43,7 @@ xml_files = $(entities) $(docname).xml
 omf_dir=$(top_srcdir)/omf-install
 
 EXTRA_DIST = $(xml_files) $(omffile)
-CLEANFILES = omf_timestamp
+CLEANFILES = omf_timestamp Makefile
 
 include $(top_srcdir)/doc/omf.make
 
@@ -61,6 +61,7 @@ distclean-hook:
 	then \
 	  rm -f $(entities); \
 	fi
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 app-dist-hook:
 	if test "$(figdir)"; then \