Add new plugin targets to Makefiles

diff --git a/bacula/src/plugins/fd/Makefile b/bacula/src/plugins/fd/Makefile
index 9fe9bf790cafdf316c3a80f84d5deedd22aa9473..df032ccf7d5a856485c242af1599d3fa45b11757 100644 (file)
--- 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 5a87a6c482e798a6ce565fd3b8487aab4dcb0c7d..56defb2313d0562d61e860c3652dd93a5d08dd95 100644 (file)
--- 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 b864dd1ab5a77d6d80c0870437dbcaa882d537cb..2ab6f73c99c490fa684bb8b9490af947e86e805f 100644 (file)
--- 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 \