plugins: move plugin loader to gplugind directory

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 917d275..68cd961 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -66,7 +66,6 @@ gsignond-identity-info.h\
 gsignond-identity-info-internal.h\
 gsignond-pipe-stream.h\
 gsignond-plugin-enum-types.h\
-gsignond-plugin-loader.h\
 gsignond-db-defines.h\
 gsignond-db-error.h\
 gsignond-db-secret-database.h\

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 40e3b5c..baf7098 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -60,8 +60,6 @@ libgsignond_common_la_SOURCES = \
     gsignond-dictionary.c \
     gsignond-session-data.c \
     gsignond-signonui-data.c \
-    gsignond-plugin-loader.h \
-    gsignond-plugin-loader.c \
     gsignond-utils.c \
     gsignond-pipe-stream.h \
     gsignond-pipe-stream.c \

diff --git a/src/daemon/plugins/Makefile.am b/src/daemon/plugins/Makefile.am
index 66b08ea..2b3e85c 100644 (file)
--- a/src/daemon/plugins/Makefile.am
+++ b/src/daemon/plugins/Makefile.am
@@ -8,6 +8,7 @@ libgsignond_plugins_la_CPPFLAGS = \
     -I$(top_srcdir)/include \
     -I$(top_builddir)/src \
     -DGSIGNOND_PLUGINLOADERS_DIR='"$(pluginloadersdir)"' \
+    -DGSIGNOND_GPLUGINS_DIR='"$(gpluginsdir)"' \
     $(GSIGNOND_CFLAGS)
 
 libgsignond_plugins_la_LIBADD =    \

diff --git a/src/daemon/plugins/gsignond-plugin-proxy-factory.c b/src/daemon/plugins/gsignond-plugin-proxy-factory.c
index 9b74548..32dced8 100644 (file)
--- a/src/daemon/plugins/gsignond-plugin-proxy-factory.c
+++ b/src/daemon/plugins/gsignond-plugin-proxy-factory.c
@@ -29,7 +29,6 @@
 #include "config.h"
 
 #include "gsignond/gsignond-log.h"
-#include "common/gsignond-plugin-loader.h"
 #include "gsignond-plugin-proxy-factory.h"
 #include "gsignond-plugin-remote.h"
 

diff --git a/src/daemon/plugins/gsignond-plugin-proxy.c b/src/daemon/plugins/gsignond-plugin-proxy.c
index 7e2e225..a269fcd 100644 (file)
--- a/src/daemon/plugins/gsignond-plugin-proxy.c
+++ b/src/daemon/plugins/gsignond-plugin-proxy.c
@@ -26,7 +26,6 @@
 #include "gsignond/gsignond-error.h"
 #include "gsignond/gsignond-log.h"
 #include "gsignond/gsignond-config.h"
-#include "common/gsignond-plugin-loader.h"
 #include "daemon/gsignond-auth-session.h"
 #include "gsignond-plugin-proxy.h"
 #include "gsignond-plugin-remote.h"

diff --git a/src/gplugind/Makefile.am b/src/gplugind/Makefile.am
index 2de7052..d2d99bf 100644 (file)
--- a/src/gplugind/Makefile.am
+++ b/src/gplugind/Makefile.am
@@ -10,6 +10,7 @@ libgsignond_plugind_daemon_la_CPPFLAGS = \
     -I$(top_srcdir)/src \
     -I$(top_srcdir)/include \
     -I$(top_builddir)/src \
+    -DGSIGNOND_GPLUGINS_DIR='"$(gpluginsdir)"' \
     $(GSIGNOND_CFLAGS)
 
 libgsignond_plugind_daemon_la_LIBADD =    \
@@ -18,6 +19,8 @@ libgsignond_plugind_daemon_la_LIBADD =    \
         $(GSIGNOND_LIBS)
 
 libgsignond_plugind_daemon_la_SOURCES = \
+   gsignond-plugin-loader.h \
+   gsignond-plugin-loader.c \
    gsignond-plugin-daemon.h \
    gsignond-plugin-daemon.c
 

diff --git a/src/gplugind/gsignond-plugin-daemon.c b/src/gplugind/gsignond-plugin-daemon.c
index ea9f9eb..0640cc3 100644 (file)
--- a/src/gplugind/gsignond-plugin-daemon.c
+++ b/src/gplugind/gsignond-plugin-daemon.c
@@ -26,7 +26,7 @@
 #include "gsignond/gsignond-plugin-interface.h"
 #include "gsignond/gsignond-log.h"
 #include "gsignond/gsignond-error.h"
-#include "common/gsignond-plugin-loader.h"
+#include "gsignond-plugin-loader.h"
 #include "common/gsignond-pipe-stream.h"
 #include "daemon/dbus/gsignond-dbus-remote-plugin-gen.h"
 #include "daemon/dbus/gsignond-dbus.h"

diff --git a/src/common/gsignond-plugin-loader.c b/src/gplugind/gsignond-plugin-loader.c
similarity index 100%
rename from src/common/gsignond-plugin-loader.c
rename to src/gplugind/gsignond-plugin-loader.c

diff --git a/src/common/gsignond-plugin-loader.h b/src/gplugind/gsignond-plugin-loader.h
similarity index 100%
rename from src/common/gsignond-plugin-loader.h
rename to src/gplugind/gsignond-plugin-loader.h

diff --git a/test/common/Makefile.am b/test/common/Makefile.am
index 07242ee..d98f3c9 100644 (file)
--- a/test/common/Makefile.am
+++ b/test/common/Makefile.am
@@ -18,5 +18,6 @@ commontest_CFLAGS = \
 
 commontest_LDADD = \
     $(top_builddir)/src/common/libgsignond-common.la \
+    $(top_builddir)/src/gplugind/libgsignond-plugind-daemon.la \
     $(GSIGNOND_LIBS) \
     $(CHECK_LIBS)

diff --git a/test/common/commontest.c b/test/common/commontest.c
index 7f36589..efe30bf 100644 (file)
--- a/test/common/commontest.c
+++ b/test/common/commontest.c
@@ -35,7 +35,7 @@
 #include "gsignond/gsignond-utils.h"
 #include "common/gsignond-identity-info.h"
 #include "common/gsignond-pipe-stream.h"
-#include "common/gsignond-plugin-loader.h"
+#include "gplugind/gsignond-plugin-loader.h"
 
 static GSequence*
 _sequence_new (gchar *data)

diff --git a/test/plugins/digestplugintest.c b/test/plugins/digestplugintest.c
index 5bf8702..8743301 100644 (file)
--- a/test/plugins/digestplugintest.c
+++ b/test/plugins/digestplugintest.c
@@ -32,7 +32,6 @@
 #include "gsignond/gsignond-log.h"
 #include "gsignond/gsignond-config.h"
 #include "gsignond/gsignond-utils.h"
-#include "common/gsignond-plugin-loader.h"
 
 static const gchar *realm_list[] = { "realm1", "realm2", "realm3", NULL };
 

diff --git a/test/plugins/passwordplugintest.c b/test/plugins/passwordplugintest.c
index 5c7670a..5459544 100644 (file)
--- a/test/plugins/passwordplugintest.c
+++ b/test/plugins/passwordplugintest.c
@@ -31,7 +31,6 @@
 #include "gsignond/gsignond-plugin-interface.h"
 #include "gsignond/gsignond-error.h"
 #include "gsignond/gsignond-config.h"
-#include "common/gsignond-plugin-loader.h"
 
 
 static void check_plugin(GSignondPlugin* plugin)

diff --git a/test/plugins/pluginproxytest.c b/test/plugins/pluginproxytest.c
index 652ebe2..5c2486a 100644 (file)
--- a/test/plugins/pluginproxytest.c
+++ b/test/plugins/pluginproxytest.c
@@ -33,7 +33,6 @@
 #include "gsignond-plugin-remote.h"
 #include "gsignond/gsignond-error.h"
 #include "gsignond/gsignond-log.h"
-#include "common/gsignond-plugin-loader.h"
 
 static GMainLoop *main_loop = NULL;