From: Radosław Korzeniewski <radoslaw@korzeniewski.net>
Date: Wed, 10 Feb 2021 15:03:01 +0000 (+0100)
Subject: docker: Fix build after pluginlib introduction.
X-Git-Tag: Release-11.3.2~704
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ef6fc62800e9d7964e30753a561c35a755ab9ff;p=thirdparty%2Fbacula.git

docker: Fix build after pluginlib introduction.
---

diff --git a/bacula/src/plugins/fd/Makefile.in b/bacula/src/plugins/fd/Makefile.in
index 9043db263..9e131ea4b 100644
--- a/bacula/src/plugins/fd/Makefile.in
+++ b/bacula/src/plugins/fd/Makefile.in
@@ -18,15 +18,12 @@ 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:
 	$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c $<
 
-all: bpipe-fd.la test-plugin-fd.la test-deltaseq-fd.la pluglib.lo
+all: bpipe-fd.la test-plugin-fd.la test-deltaseq-fd.la
 
 example-plugin-fd.lo: example-plugin-fd.c ${FDDIR}/fd_plugins.h
 	$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I../.. -I${FDDIR} -c example-plugin-fd.c
diff --git a/bacula/src/plugins/fd/docker/Makefile.in b/bacula/src/plugins/fd/docker/Makefile.in
index 0370f08eb..fcc66ef5f 100644
--- a/bacula/src/plugins/fd/docker/Makefile.in
+++ b/bacula/src/plugins/fd/docker/Makefile.in
@@ -9,10 +9,11 @@
 
 # No optimization for now for easy debugging
 
-FDDIR=../../../filed
-SRCDIR=../../..
-LIBDIR=../../../lib
 FDPLUGDIR=..
+SRCDIR=$(FDPLUGDIR)/../..
+FDDIR=$(SRCDIR)/filed
+LIBDIR=$(SRCDIR)/lib
+PLUGINLIBDIR=$(FDPLUGDIR)/pluginlib
 
 topdir = @BUILD_DIR@
 working_dir=@working_dir@
@@ -34,10 +35,10 @@ all: docker-fd.la
 	@echo "Compiling $< ..."
 	$(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${FDDIR} -I${FDPLUGDIR} -DWORKDIR=\"$(DESTDIR)$(working_dir)\" -c $(@:.lo=.c)
 
-$(FDPLUGDIR)/pluglib.lo:
-	$(MAKE) -C $(FDPLUGDIR) pluglib.lo
+$(PLUGINLIBDIR)/pluginlib.lo: $(PLUGINLIBDIR)/pluginlib.cpp $(PLUGINLIBDIR)/pluginlib.h
+	$(MAKE) -C $(PLUGINLIBDIR) pluginlib.lo
 
-docker-fd.la: Makefile $(DOCKEROBJ) $(FDPLUGDIR)/pluglib.lo $(DOCKERSRCH)
+docker-fd.la: Makefile $(DOCKEROBJ) $(PLUGINLIBDIR)/pluginlib.lo $(DOCKERSRCH)
 	@echo "Linking $(@:.la=.so) ..."
 	$(NO_ECHO)$(LIBTOOL_LINK) --silent $(CXX) $(LDFLAGS) -shared $^ -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version