[gdm/gnome-3-2] data: fix make dependencies

[Ray Strode <halfline src gnome org>]

commit 46f6c1ca7ed4f1b4fe40bdaa4f9a3ce911fd8445
Author: Ray Strode <rstrode redhat com>
Date:   Tue Oct 18 22:00:47 2011 -0400

    data: fix make dependencies
    
    dist-hook was referencing files it didn't depend on explicitly.
    Also, linearize the dep tree of those files so that in parallel
    make setups we don't end up running the generation script twice.

 data/Makefile.am |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 7488ed3..6937eb3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -153,10 +153,12 @@ MAINTAINERCLEANFILES =			\
 	gdm-smartcard			\
 	Makefile.in
 
-00-upstream-settings 00-upstream-settings-locks: $(srcdir)/gdm-update-dconf-db
+00-upstream-settings: $(srcdir)/gdm-update-dconf-db
 	$(srcdir)/gdm-update-dconf-db $(srcdir)/upstream-settings 00-upstream-settings
 
-dist-hook:
+00-upstream-settings-locks: 00-upstream-settings
+
+dist-hook: 00-upstream-settings 00-upstream-settings-locks
 	cp $(srcdir)/00-upstream-settings $(distdir)
 	cp $(srcdir)/00-upstream-settings-locks $(distdir)