[gnome-pilot] fix include problem when using a separate build directory. #634880 2011-01-03 Matt Davey <mcdavey@

[Matthew Charles Davey <mcdavey src gnome org>]

commit ab43692efd94dfed262d2820594a864503c16508
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Mon Jan 3 15:43:05 2011 +0000

    fix include problem when using a separate build directory.  #634880
    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.
           * capplet/Makefile.am: ditto
           * conduits/evolution-data-server/Makefile.am: ditto
           * conduits/file/Makefile.am: ditto
           * gpilotd/Makefile.am: ditto
           * utils/Makefile.am: ditto
           * gpilotd/gpilot-daemon.c: remove unused variable.

 .gitignore                                 |    3 +++
 applet/Makefile.am                         |    1 +
 capplet/Makefile.am                        |    1 +
 conduits/evolution-data-server/Makefile.am |    1 +
 conduits/file/Makefile.am                  |    1 +
 gpilotd/Makefile.am                        |    1 +
 gpilotd/gpilot-daemon.c                    |    1 -
 utils/Makefile.am                          |    1 +
 8 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 07f3792..eb348cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,6 +85,9 @@ gpilotd/gpmarshal.c
 gpilotd/gpmarshal.h
 gnome-doc-utils.make
 help/C/gnome-pilot-C.omf.out
+help/gnome-pilot-C.omf
+help/gnome-pilot-de.omf
+help/gnome-pilot-es.omf
 help/C/omf_timestamp
 help/de/de.mo
 help/de/gnome-pilot.xml
diff --git a/applet/Makefile.am b/applet/Makefile.am
index 043e8f1..88970d6 100644
--- a/applet/Makefile.am
+++ b/applet/Makefile.am
@@ -32,6 +32,7 @@ gpilot_applet_LDADD = 				\
 
 AM_CPPFLAGS = 						\
 	-I$(top_srcdir)					\
+	-I$(top_builddir)/gpilotd -I$(top_srcdir)/gpilotd \
 	$(GNOME_PILOT_CFLAGS)				\
 	$(PILOT_APPLET_CFLAGS)			\
 	-DUIDATADIR=\""$(uidir)"\" 		\
diff --git a/capplet/Makefile.am b/capplet/Makefile.am
index 15ffbf6..ea65d00 100644
--- a/capplet/Makefile.am
+++ b/capplet/Makefile.am
@@ -4,6 +4,7 @@ bin_PROGRAMS = gpilotd-control-applet
 
 AM_CPPFLAGS = 						\
 	-I$(top_srcdir) 				\
+	-I$(top_builddir)/gpilotd			\
 	-I$(top_srcdir)/gpilotd				\
 	$(GNOME_PILOT_CFLAGS) 				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
diff --git a/conduits/evolution-data-server/Makefile.am b/conduits/evolution-data-server/Makefile.am
index 0eac362..f7c432e 100644
--- a/conduits/evolution-data-server/Makefile.am
+++ b/conduits/evolution-data-server/Makefile.am
@@ -9,6 +9,7 @@ module_LTLIBRARIES = \
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
+	-I$(top_builddir)/gpilotd -I$(top_srcdir)/gpilotd \
 	$(GNOME_PILOT_CFLAGS) \
 	$(EVOLUTION_DATA_SERVER_CFLAGS) \
 	-DG_LOG_DOMAIN=\"eds-conduits\"
diff --git a/conduits/file/Makefile.am b/conduits/file/Makefile.am
index 62f04d6..4783292 100644
--- a/conduits/file/Makefile.am
+++ b/conduits/file/Makefile.am
@@ -1,5 +1,6 @@
 AM_CPPFLAGS = 					\
 	-I$(top_srcdir)	 			\
+	-I$(top_builddir)/gpilotd		\
 	-I$(top_srcdir)/gpilotd			\
 	$(GNOME_PILOT_CFLAGS) 			\
 	-DG_LOG_DOMAIN=\"fileconduit\" 		\
diff --git a/gpilotd/Makefile.am b/gpilotd/Makefile.am
index ede664a..a593301 100644
--- a/gpilotd/Makefile.am
+++ b/gpilotd/Makefile.am
@@ -99,6 +99,7 @@ gobfiles = 						\
 # 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
+	$(MKDIR_P) ../libgpilotdCM
 	$(GOB) --always-private-header -o  ../libgpilotdCM -w $<
 
 %.c %.h: %.gob
diff --git a/gpilotd/gpilot-daemon.c b/gpilotd/gpilot-daemon.c
index 82b9389..2fec11f 100644
--- a/gpilotd/gpilot-daemon.c
+++ b/gpilotd/gpilot-daemon.c
@@ -431,7 +431,6 @@ static void gpilotd_gudev_handler  (GUdevClient *client, gchar *action, GUdevDev
 static gboolean
 gpilotd_gudev_init (void)
 {
-	GError *error = NULL;
 	const gchar * const udev_subsystems[2] = { "usb/usb_device", NULL};
 
 	/* Just use g_udev_client / g_udev_device
diff --git a/utils/Makefile.am b/utils/Makefile.am
index d76a6f4..862a5f2 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,5 +1,6 @@
 AM_CPPFLAGS = 								\
 	-I$(top_srcdir)							\
+	-I$(top_builddir)/gpilotd					\
 	-I$(top_srcdir)/gpilotd						\
 	$(GNOME_PILOT_CFLAGS) 						\
         -DG_LOG_DOMAIN=\"gpilotd-client\" 				\