From: Radosław Korzeniewski <radekk@inteos.pl>
Date: Wed, 23 Dec 2020 16:02:45 +0000 (+0100)
Subject: docker: Refactor to use new pluginlib.
X-Git-Tag: Release-11.3.2~732
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b44f284f6506728eaab6cf1342d066054f8ac83;p=thirdparty%2Fbacula.git

docker: Refactor to use new pluginlib.
---

diff --git a/bacula/src/plugins/fd/Makefile.in b/bacula/src/plugins/fd/Makefile.in
index b1098565d..caee1921c 100644
--- 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 13475d9a2..20c908db2 100644
--- 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 8803e8488..3f6a54f6a 100644
--- 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 {