[gcr] various srcdir != builddir fixes

[Ryan Lortie <ryanl src gnome org>]

commit a3cdb51965d83a7c2e817b6559047b514c09e9f6
Author: Ryan Lortie <desrt desrt ca>
Date:   Sat Jan 7 22:15:34 2012 -0500

    various srcdir != builddir fixes
    
    https://bugzilla.gnome.org/show_bug.cgi?id=667573

 gck/Makefile.am |   11 +++++------
 gck/gck.h       |    2 +-
 gcr/Makefile.am |   25 ++++++++++---------------
 gcr/gcr-base.h  |    2 +-
 gcr/gcr.h       |    2 +-
 5 files changed, 18 insertions(+), 24 deletions(-)
---
diff --git a/gck/Makefile.am b/gck/Makefile.am
index b761819..95c39f7 100644
--- a/gck/Makefile.am
+++ b/gck/Makefile.am
@@ -16,6 +16,7 @@ inc_HEADERS = \
 
 INCLUDES = \
 	-I$(top_builddir) \
+	-I$(top_srcdir)/gcr \
 	-I$(top_srcdir) \
 	$(P11_KIT_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
@@ -90,13 +91,11 @@ gck-marshal.c: gck-marshal.list $(GLIB_GENMARSHAL)
 	echo "#include \"gck-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=_gck_marshal >> $@
 
-gck-enum-types.h: gck.h gck-enum-types.h.template
-	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gck-enum-types.h.template \
-		$(HEADER_FILES) > $@
+gck-enum-types.h: gck-enum-types.h.template $(HEADER_FILES)
+	$(AM_V_GEN) $(GLIB_MKENUMS) --template $^ > $@
 
-gck-enum-types.c: gck.h gck-enum-types.c.template
-	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gck-enum-types.c.template \
-		$(HEADER_FILES) > $@
+gck-enum-types.c: gck-enum-types.c.template $(HEADER_FILES)
+	$(AM_V_GEN) $(GLIB_MKENUMS) --template $^ > $@
 
 # ------------------------------------------------------------------
 # INTROSPECTION
diff --git a/gck/gck.h b/gck/gck.h
index 565b368..8c596c9 100644
--- a/gck/gck.h
+++ b/gck/gck.h
@@ -32,7 +32,7 @@
 
 #define __GCK_INSIDE_HEADER__
 
-#include "gck-enum-types.h"
+#include <gck/gck-enum-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index 6caeb29..adda387 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -238,24 +238,20 @@ gcr-marshal.c: gcr-marshal.list $(GLIB_GENMARSHAL)
 	$(AM_V_GEN) ( echo "#include \"gcr-marshal.h\"" > $@ && \
 		$(GLIB_GENMARSHAL) $< --body --prefix=_gcr_marshal >> $@ )
 
-gcr-enum-types.h: $(HEADER_UI_FILES) gcr-enum-types.h.template
-	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gcr-enum-types.h.template \
-		$(HEADER_UI_FILES) > $@
+gcr-enum-types.h: gcr-enum-types.h.template $(HEADER_UI_FILES)
+	$(AM_V_GEN) $(GLIB_MKENUMS) --template $^ > $@
 
-gcr-enum-types.c: $(HEADER_UI_FILES) gcr-enum-types.c.template
-	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gcr-enum-types.c.template \
-		$(HEADER_UI_FILES) > $@
+gcr-enum-types.c: gcr-enum-types.c.template $(HEADER_UI_FILES)
+	$(AM_V_GEN) $(GLIB_MKENUMS) --template $^ > $@
 
-gcr-enum-types-base.h: $(HEADER_BASE_FILES) gcr-enum-types.h.template
-	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gcr-enum-types.h.template \
-		$(HEADER_BASE_FILES) > $@
+gcr-enum-types-base.h: gcr-enum-types.h.template $(HEADER_BASE_FILES)
+	$(AM_V_GEN) $(GLIB_MKENUMS) --template $^ > $@
 
-gcr-enum-types-base.c: $(HEADER_BASE_FILES) gcr-enum-types.c.template
-	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gcr-enum-types.c.template \
-		$(HEADER_BASE_FILES) > $@
+gcr-enum-types-base.c: gcr-enum-types.c.template $(HEADER_BASE_FILES)
+	$(AM_V_GEN) $(GLIB_MKENUMS) --template $^ > $@
 
 gcr-oids.c: gcr-oids.list gcr-mkoids
-	$(AM_V_GEN) sh gcr-mkoids -p GCR -c gcr-oids.c -h gcr-oids.h gcr-oids.list
+	$(AM_V_GEN) sh $(srcdir)/gcr-mkoids -p GCR -c gcr-oids.c -h gcr-oids.h $(srcdir)/gcr-oids.list
 
 gcr-oids.h: gcr-oids.c
 
@@ -264,8 +260,7 @@ DBUS_XML_DEFINITIONS = \
 
 gcr-dbus-generated.c: $(DBUS_XML_DEFINITIONS)
 	$(AM_V_GEN) gdbus-codegen --interface-prefix org.gnome.keyring.internal. \
-		--generate-c-code gcr-dbus-generated --c-namespace GcrDBus \
-		$(DBUS_XML_DEFINITIONS)
+		--generate-c-code gcr-dbus-generated --c-namespace GcrDBus $^
 	$(AM_V_GEN) sed -i -e 's/gcr_dbus/_gcr_dbus/g' gcr-dbus-generated.[ch]
 
 gcr-dbus-generated.h: gcr-dbus-generated.c
diff --git a/gcr/gcr-base.h b/gcr/gcr-base.h
index 873b2de..907cf93 100644
--- a/gcr/gcr-base.h
+++ b/gcr/gcr-base.h
@@ -38,7 +38,7 @@
 #include "gcr-certificate-chain.h"
 #include "gcr-certificate-request.h"
 #include "gcr-deprecated-base.h"
-#include "gcr-enum-types-base.h"
+#include <gcr/gcr-enum-types-base.h>
 #include "gcr-filter-collection.h"
 #include "gcr-icons.h"
 #include "gcr-importer.h"
diff --git a/gcr/gcr.h b/gcr/gcr.h
index a7c9f35..719971d 100644
--- a/gcr/gcr.h
+++ b/gcr/gcr.h
@@ -42,7 +42,7 @@
 #include "gcr-deprecated.h"
 #include "gcr-key-renderer.h"
 #include "gcr-key-widget.h"
-#include "gcr-enum-types.h"
+#include <gcr/gcr-enum-types.h>
 #include "gcr-failure-renderer.h"
 #include "gcr-key-renderer.h"
 #include "gcr-key-widget.h"