[gnome-photos] build: Fix CLEANFILES / DISTCLEANFILES, and always build AUTHORS

[Debarshi Ray <debarshir src gnome org>]

commit 73496c82f78d226d489490906ef38322c31ea4cf
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Aug 15 22:12:23 2012 +0200

    build: Fix CLEANFILES / DISTCLEANFILES, and always build AUTHORS
    
    One advantage of always generating the AUTHORS from Git is that we can
    use it in the GtkAboutDialog.

 AUTHORS          |    2 --
 Makefile.am      |   25 +++++++++++++++----------
 data/Makefile.am |   13 +++++++++----
 src/Makefile.am  |    9 +++------
 4 files changed, 27 insertions(+), 22 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ef888c1..7358cfb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,10 @@ EXTRA_DIST = \
 	$(photosdoc_DATA) \
 	$(NULL)
 
+CLEANFILES = \
+	AUTHORS \
+	$(NULL)
+
 DISTCLEANFILES = \
 	intltool-extract \
 	intltool-merge \
@@ -29,21 +33,20 @@ DISTCLEANFILES = \
 	po/.intltool-merge-cache \
 	$(NULL)
 
-dist-hook:
+AUTHORS:
 	@if test -d "$(srcdir)/.git"; \
 	then \
-		echo Creating AUTHORS && \
+		echo Creating $@ && \
 		( cd "$(top_srcdir)" && \
 		  echo '# Generated by Makefile. Do not edit.'; echo; \
-		  $(top_srcdir)/missing --run \
-		     git log --no-merges --pretty=format:"%an" src \
-		     | sort | uniq ) > AUTHORS.tmp \
-		&& mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
-		|| ( rm -f AUTHORS.tmp ; \
-		     echo Failed to generate AUTHORS >&2 ); \
-	else \
-		echo A git clone is required to generate an AUTHORS >&2; \
+		  git log --no-merges --pretty=format:"%an" src \
+		  | sort | uniq ) > $  tmp \
+		&& mv -f $  tmp $@ \
+		|| ( rm -f $  tmp ; \
+		     echo Failed to generate $@ >&2 ); \
 	fi
+
+dist-hook:
 	@if test -d "$(srcdir)/.git"; \
 	then \
 		echo Creating ChangeLog && \
@@ -56,3 +59,5 @@ dist-hook:
 	else \
 		echo A git clone is required to generate a ChangeLog >&2; \
 	fi
+
+.PHONY: AUTHORS
diff --git a/data/Makefile.am b/data/Makefile.am
index 40a41ff..6d9b78c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,9 @@
 SUBDIRS =
 
 desktopdir = $(datadir)/applications
-desktop_in_files = $(PACKAGE_TARNAME).desktop.in.in
-desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+desktop_in_in_files = $(PACKAGE_TARNAME).desktop.in.in
+desktop_in_files = $(PACKAGE_TARNAME).desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 gsettings_in_files = org.gnome.photos.gschema.xml.in
@@ -18,11 +19,15 @@ dist_icons_DATA = \
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
-	$(desktop_in_files) \
+	$(desktop_in_in_files) \
 	$(gsettings_in_files) \
 	$(NULL)
 
-DISTCLEANFILES = \
+CLEANFILES = \
 	$(desktop_DATA) \
 	$(gsettings_SCHEMAS) \
 	$(NULL)
+
+DISTCLEANFILES = \
+	$(desktop_in_files) \
+	$(NULL)
diff --git a/src/Makefile.am b/src/Makefile.am
index c3de678..9400a96 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -136,18 +136,15 @@ gnome_photos_LDADD = \
 if MAINTAINER_MODE
 
 CLEANFILES = \
+	$(gnome_photos_built_sources) \
+	stamp-photos-enums.h \
+	stamp-photos-marshalers.h \
 	xgen-etbc \
 	xgen-etbh \
 	xgen-tmc \
 	xgen-tmh \
 	$(NULL)
 
-DISTCLEANFILES = \
-	$(gnome_photos_built_sources) \
-	stamp-photos-enums.h \
-	stamp-photos-marshalers.h \
-	$(NULL)
-
 photos-enums.h: stamp-photos-enums.h
 	@true