From: Eric Bollengier <eric@baculasystems.com>
Date: Tue, 15 Mar 2022 14:26:57 +0000 (+0100)
Subject: Add new plugin targets to Makefiles
X-Git-Tag: Release-11.3.2~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63631fa39c34fbd0adcc911afe352f5a5c21e77f;p=thirdparty%2Fbacula.git

Add new plugin targets to Makefiles
---

diff --git a/bacula/src/plugins/fd/Makefile b/bacula/src/plugins/fd/Makefile
index 9fe9bf790..df032ccf7 100644
--- a/bacula/src/plugins/fd/Makefile
+++ b/bacula/src/plugins/fd/Makefile
@@ -122,7 +122,7 @@ test_kubernetes_backend: Makefile $(TESTKUBEOBJ) $(PLUGINLIBDIR)/test_metaplugin
 	@echo "Building backend $@ ..."
 	$(NO_ECHO)$(LIBTOOL_LINK) --silent $(CXX) $(LDFLAGS) test_kubernetes_backend.lo $(PLUGINLIBDIR)/test_metaplugin_backend.lo -o $@
 
-install: all
+install: all $(EXTRA_INSTALL_TARGET)
 	$(MKDIR) $(DESTDIR)$(plugindir)
 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir)
 	$(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la
diff --git a/bacula/src/plugins/fd/Makefile.inc.in b/bacula/src/plugins/fd/Makefile.inc.in
index 5a87a6c48..56defb231 100644
--- a/bacula/src/plugins/fd/Makefile.inc.in
+++ b/bacula/src/plugins/fd/Makefile.inc.in
@@ -26,6 +26,8 @@ LIBBACOBJ = $(LIBDIR)/libbac.la
 PLUGINLIBOBJ = $(PLUGINLIBDIR)/pluginlib.lo
 METAPLUGINOBJ = $(PLUGINLIBOBJ) $(PLUGINLIBDIR)/ptcomm.lo $(PLUGINLIBDIR)/metaplugin.lo $(PLUGINLIBDIR)/metaplugin_attributes.lo
 
+EXTRA_INSTALL_TARGET = @FD_PLUGIN_INSTALL@
+
 .SUFFIXES:    .c .cpp   .lo
 
 $(UNITTESTSOBJ):
diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in
index b864dd1ab..2ab6f73c9 100644
--- a/bacula/src/tools/Makefile.in
+++ b/bacula/src/tools/Makefile.in
@@ -45,7 +45,7 @@ TOOLS = $(@DIR_TOOLS@)
 
 INSNODIRTOOLS = bsmtp
 INSDIRTOOLS = bsmtp dbcheck bwild bregex
-INSTOOLS = $(INS@DIR_TOOLS@)
+INSTOOLS = $(INS@DIR_TOOLS@) @TOOLS_INSTALL@
 INSTTESTS = breaddir_test bpipe_test tags_test xattr_append_test
 
 .SUFFIXES:	.c .o
@@ -240,6 +240,9 @@ installall:  $(TOOLS) timelimit
 #	chattr +i $(DESTDIR)$(sbindir)/bsmtp
 #	chmod 755 $(DESTDIR)$(sbindir)/bsmtp
 
+install-cdp:
+	$(MAKE) -C cdp-client install
+
 # Allow non-root execution of bsmtp for non-root Directors
 install: $(INSTOOLS)
 	@for tool in ${INSTOOLS} ; do \