[gcr/ssh-askpass: 1/2] egg: Move mock-interaction.[ch] to egg/ directory

[Stefan Walter <stefw src gnome org>]

commit d3ddbd63821c289f3cf0500e34524959b02711e1
Author: Stef Walter <stefw redhat com>
Date:   Wed Sep 3 11:04:06 2014 +0200

    egg: Move mock-interaction.[ch] to egg/ directory
    
    Since we want to use this from the gcr/ code
    
    https://bugzilla.gnome.org/show_bug.cgi?id=735873

 docs/reference/gck/Makefile.am  |    3 +--
 egg/Makefile.am                 |    3 ++-
 {gck => egg}/mock-interaction.c |    0
 {gck => egg}/mock-interaction.h |    0
 gck/Makefile.am                 |   12 ++++--------
 gck/test-gck-enumerator.c       |    3 +--
 gck/test-gck-session.c          |    3 +--
 7 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/docs/reference/gck/Makefile.am b/docs/reference/gck/Makefile.am
index 02da77b..ec57541 100644
--- a/docs/reference/gck/Makefile.am
+++ b/docs/reference/gck/Makefile.am
@@ -62,8 +62,7 @@ IGNORE_HFILES= \
        pkcs11.h \
        pkcs11n.h \
        pkcs11x.h \
-       pkcs11i.h \
-       mock-interaction.h
+       pkcs11i.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff --git a/egg/Makefile.am b/egg/Makefile.am
index be2fd24..b4b8c3b 100644
--- a/egg/Makefile.am
+++ b/egg/Makefile.am
@@ -59,7 +59,8 @@ libegg_secmem_la_SOURCES = \
        egg/egg-secure-memory.c egg/egg-secure-memory.h
 
 libegg_test_la_SOURCES = \
-       egg/egg-testing.c egg/egg-testing.h
+       egg/egg-testing.c egg/egg-testing.h \
+       egg/mock-interaction.c egg/mock-interaction.h
 
 libegg_test_la_CFLAGS = \
        $(GLIB_CFLAGS)
diff --git a/gck/mock-interaction.c b/egg/mock-interaction.c
similarity index 100%
rename from gck/mock-interaction.c
rename to egg/mock-interaction.c
diff --git a/gck/mock-interaction.h b/egg/mock-interaction.h
similarity index 100%
rename from gck/mock-interaction.h
rename to egg/mock-interaction.h
diff --git a/gck/Makefile.am b/gck/Makefile.am
index 44a2882..10fb456 100644
--- a/gck/Makefile.am
+++ b/gck/Makefile.am
@@ -213,11 +213,9 @@ test_gck_crypto_SOURCES = gck/test-gck-crypto.c
 test_gck_crypto_CFLAGS = $(gck_CFLAGS)
 test_gck_crypto_LDADD = $(gck_LIBS)
 
-test_gck_enumerator_SOURCES = \
-       gck/test-gck-enumerator.c \
-       gck/mock-interaction.c gck/mock-interaction.h
+test_gck_enumerator_SOURCES = gck/test-gck-enumerator.c
 test_gck_enumerator_CFLAGS = $(gck_CFLAGS)
-test_gck_enumerator_LDADD = $(gck_LIBS)
+test_gck_enumerator_LDADD = libegg-test.la $(gck_LIBS)
 
 test_gck_object_SOURCES = gck/test-gck-object.c
 test_gck_object_CFLAGS = $(gck_CFLAGS)
@@ -231,11 +229,9 @@ test_gck_modules_SOURCES = gck/test-gck-modules.c
 test_gck_modules_CFLAGS = $(gck_CFLAGS)
 test_gck_modules_LDADD = $(gck_LIBS)
 
-test_gck_session_SOURCES = \
-       gck/test-gck-session.c \
-       gck/mock-interaction.c gck/mock-interaction.h
+test_gck_session_SOURCES = gck/test-gck-session.c
 test_gck_session_CFLAGS = $(gck_CFLAGS)
-test_gck_session_LDADD = $(gck_LIBS)
+test_gck_session_LDADD = libegg-test.la $(gck_LIBS)
 
 test_gck_slot_SOURCES = gck/test-gck-slot.c
 test_gck_slot_CFLAGS = $(gck_CFLAGS)
diff --git a/gck/test-gck-enumerator.c b/gck/test-gck-enumerator.c
index 90e7253..13ea19f 100644
--- a/gck/test-gck-enumerator.c
+++ b/gck/test-gck-enumerator.c
@@ -27,9 +27,8 @@
 #include "gck/gck-private.h"
 #include "gck/gck-test.h"
 
-#include "mock-interaction.h"
-
 #include "egg/egg-testing.h"
+#include "egg/mock-interaction.h"
 
 #include <glib.h>
 
diff --git a/gck/test-gck-session.c b/gck/test-gck-session.c
index cedb436..6cd4c97 100644
--- a/gck/test-gck-session.c
+++ b/gck/test-gck-session.c
@@ -22,12 +22,11 @@
 
 #include "config.h"
 
-#include "mock-interaction.h"
-
 #include "gck/gck.h"
 #include "gck/gck-test.h"
 
 #include "egg/egg-testing.h"
+#include "egg/mock-interaction.h"
 
 #include <glib.h>