docker: Refactor to use new pluginlib.

diff --git a/bacula/src/plugins/fd/Makefile.in b/bacula/src/plugins/fd/Makefile.in
index b1098565d284fa605570afbe0afdd50586de7f6f..caee1921cc9fceae9301b9939c78009bfc314dc8 100644 (file)
--- a/bacula/src/plugins/fd/Makefile.in
+++ b/bacula/src/plugins/fd/Makefile.in
@@ -13,10 +13,14 @@
 FDDIR=../../filed
 SRCDIR=../..
 LIBDIR=../../lib
+PLUGINLIBDIR=./pluginlib
 
 topdir = @BUILD_DIR@
 thisdir = src/plugins/fd
 
+DOCKERSRC = dkcommctx.c dkcommctx.h dkid.c dkid.h dkinfo.c dkinfo.h docker-fd.c docker-fd.h
+DOCKEROBJ = $(DOCKERSRC:.c=.lo) $(PLUGINLIBDIR)/pluginlib.lo $(PLUGINLIBDIR)/ptcomm.lo
+
 .SUFFIXES:    .c .lo
 
 .c.lo:

diff --git a/bacula/src/plugins/fd/docker/dkcommctx.h b/bacula/src/plugins/fd/docker/dkcommctx.h
index 13475d9a222091d2b975cf1d52045935731bc726..20c908db236365f8d0bad7f21356ceb5aa775424 100644 (file)
--- a/bacula/src/plugins/fd/docker/dkcommctx.h
+++ b/bacula/src/plugins/fd/docker/dkcommctx.h
@@ -27,7 +27,7 @@
 #ifndef _DKCOMMCTX_H_
 #define _DKCOMMCTX_H_
 
-#include "pluglib.h"
+#include "pluginlib/pluginlib.h"
 #include "lib/ini.h"
 #include "lib/bregex.h"
 

diff --git a/bacula/src/plugins/fd/docker/dkinfo.h b/bacula/src/plugins/fd/docker/dkinfo.h
index 8803e848896ef0f12de57b3e702565bc51f03b63..3f6a54f6abd09ec02346ed5fe9c2888dd6059dd9 100644 (file)
--- a/bacula/src/plugins/fd/docker/dkinfo.h
+++ b/bacula/src/plugins/fd/docker/dkinfo.h
@@ -28,7 +28,7 @@
 #define _DKINFO_H_
 
 #include "dkid.h"
-#include "pluglib.h"
+#include "pluginlib/pluginlib.h"
 
 /* The Docker container Power states */
 typedef enum {