[gnome-pilot] fix gob rules to support parallel builds, and todo conduit map-file patch #634874, 634869.

[Matthew Charles Davey <mcdavey src gnome org>]

commit c3a26fe5f11d8c24df8ee7d0b4f403e0a8577dff
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Mon Jan 3 16:01:39 2011 +0000

    fix gob rules to support parallel builds, and todo conduit map-file patch  #634874,634869.
    
    2011-01-03  Matt Davey <mcdavey mrao cam ac uk>
           * applet/Makefile.am: fix gob rules to support
    		parallel builds.  Thanks Matt McCutchen.  #634874
           * gpilotd/Makefile.am: ditto
           * conduits/evolution-data-server/todo-conduit.c: Use
    		correct path to map file. #634869

 ChangeLog           |    8 ++++++++
 applet/Makefile.am  |    2 +-
 gpilotd/Makefile.am |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 477bcf0..2052f08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 2011-01-03  Matt Davey <mcdavey mrao cam ac uk>
+       * applet/Makefile.am: fix gob rules to support
+		parallel builds.  Thanks Matt McCutchen.  #634874
+       * gpilotd/Makefile.am: ditto
+       * conduits/evolution-data-server/todo-conduit.c: Use
+		correct path to map file. #634869
+
+
+2011-01-03  Matt Davey <mcdavey mrao cam ac uk>
        * applet/Makefile.am: #634880: fix include problem when
 		using a separate build directory.
 		Thanks to Matt McCutchen.
diff --git a/applet/Makefile.am b/applet/Makefile.am
index 88970d6..130f13b 100644
--- a/applet/Makefile.am
+++ b/applet/Makefile.am
@@ -12,7 +12,7 @@ gobfiles = 					\
 	$(srcdir)/gpilot-applet-progress.gob 	\
 	$(NULL)
 
-%.c %.h: %.gob
+%.c %.h %-private.h: %.gob
 	$(GOB2) --always-private-header -w $<
 
 gpilot_applet_SOURCES =		\
diff --git a/gpilotd/Makefile.am b/gpilotd/Makefile.am
index a593301..c452c0d 100644
--- a/gpilotd/Makefile.am
+++ b/gpilotd/Makefile.am
@@ -98,7 +98,7 @@ gobfiles = 						\
 # used to live in libgpilotdCM/, which led to a build-order bug as they're
 # dependendent on some gpilotd/ stuff.  However, third party code expects
 # the headers to be in include/libgpilotdCM so we continue to provide them there.
-../libgpilotdCM/%.c ../libgpilotdCM/%.h: %.gob
+../libgpilotdCM/%.c ../libgpilotdCM/%.h ../libgpilotdCM/%-private.h: %.gob
 	$(MKDIR_P) ../libgpilotdCM
 	$(GOB) --always-private-header -o  ../libgpilotdCM -w $<