Fix compilation

diff --git a/bacula/src/plugins/dir/Makefile b/bacula/src/plugins/dir/Makefile
index f22ec0a351a551ba526e61ebf32846b2e23e50a2..971fd8ce203e1d20c935fba36be7e90de9d966a6 100644 (file)
--- a/bacula/src/plugins/dir/Makefile
+++ b/bacula/src/plugins/dir/Makefile
@@ -17,6 +17,9 @@ include Makefile.inc
 
 all: dirpluglib.lo example-plugin-dir.la test-authentication-api-dir.la
 
+install-totp:
+       $(MAKE) -C totp/ install
+
 # example-plugin-dir.lo: example-plugin-dir.c ${DIRDIR}/dir_plugins.h
 #      $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CFLAGS) -I../.. -I${DIRDIR} -c example-plugin-dir.c
 
@@ -31,7 +34,7 @@ test-authentication-api-dir.la: test-authentication-api-dir.lo dirpluglib.lo
        @echo "Linking $(@:.la=.so) ..."
        $(NO_ECHO)$(LIBTOOL_LINK) --silent $(CXX) $(LDFLAGS) -shared $^ -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version
 
-install: all
+install: all $(DIRPLUG_INSTALL_TARGET)
        $(NO_ECHO)$(MKDIR) $(DESTDIR)$(plugindir)
 
 install-bpam-ldap:

diff --git a/bacula/src/plugins/dir/Makefile.in b/bacula/src/plugins/dir/Makefile.in
deleted file mode 100644 (file)
index 79b4eb3..0000000
--- a/bacula/src/plugins/dir/Makefile.in
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Simple Makefile for building test FD plugins for Bacula
-#
-# Copyright (C) 2000-2023 Kern Sibbald
-# License: BSD 2-Clause; see file LICENSE-FOSS
-#
-@MCOMMON@
-
-
-# No optimization for now for easy debugging
-
-DIRDIR=../../dird
-SRCDIR=../..
-LIBDIR=../../lib
-
-topdir = @BUILD_DIR@
-thisdir = src/plugins/dir
-DIRPLUG_INSTALL_TARGET = @DIRPLUG_INSTALL_TARGET@
-CURL_INC = @CURL_INC@
-CURL_LIBS = @CURL_LIBS@
-
-.SUFFIXES:    .c .o .lo
-
-.c.lo:
-       $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) -I${SRCDIR} -I${DIRDIR} -DTEST_PROGRAM -c $<
-
-all: dirpluglib.lo
-
-install-totp:
-       $(MAKE) -C totp/ install
-
-example-plugin-dir.lo: example-plugin-dir.c ${DIRDIR}/dir_plugins.h
-       $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CFLAGS) -I../.. -I${DIRDIR} -c example-plugin-dir.c
-
-example-plugin-dir.la: Makefile example-plugin-dir.lo
-       $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared example-plugin-dir.lo -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version
-
-test-authentication-api-dir.lo: test-authentication-api-dir.c ${DIRDIR}/dir_plugins.h
-       $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CFLAGS) -I../.. -I${DIRDIR} -c test-authentication-api-dir.c
-
-test-authentication-api-dir.la: Makefile test-authentication-api-dir.lo dirpluglib.lo
-       @echo "Linking $(@:.la=.so) ..."
-       $(NO_ECHO)$(LIBTOOL_LINK) --silent $(CXX) $(LDFLAGS) -shared $^ -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version
-
-install: all $(DIRPLUG_INSTALL_TARGET)
-       $(MKDIR) $(DESTDIR)$(plugindir)
-
-# $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) example-plugin-dir.la $(DESTDIR)$(plugindir)
-# $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) test-authentication-api-dir.la $(DESTDIR)$(plugindir)
-# $(RMF) $(DESTDIR)$(plugindir)/example-plugin-dir.la
-# $(RMF) $(DESTDIR)$(plugindir)/test-authentication-api-dir.la
-
-libtool-clean:
-       find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF)
-       $(RMF) *.la
-       $(RMF) -r .libs _libs
-
-clean: @LIBTOOL_CLEAN_TARGET@
-       rm -f main *.so *.o 1 2 3
-
-distclean: clean
-       rm -f Makefile
-
-libtool-uninstall:
-       $(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(plugindir)/example-plugin-dir.la
-
-Makefile: Makefile.in $(topdir)/config.status
-       cd $(topdir) \
-         && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-uninstall: @LIBTOOL_UNINSTALL_TARGET@
-
-depend:

diff --git a/bacula/src/plugins/dir/Makefile.inc.in b/bacula/src/plugins/dir/Makefile.inc.in
index e9ed2e1831198d1536fa18d1ccd43262f5d21d90..1ec958e54e77f20ac3b176886bc8b0208d8aac17 100644 (file)
--- a/bacula/src/plugins/dir/Makefile.inc.in
+++ b/bacula/src/plugins/dir/Makefile.inc.in
@@ -25,4 +25,8 @@ DIRDIR = $(SRCDIR)/dird
 LIBDIR = $(SRCDIR)/lib
 DIRPLUGDIR = $(SRCDIR)/plugins/dir
 
+DIRPLUG_INSTALL_TARGET = @DIRPLUG_INSTALL_TARGET@
+CURL_INC = @CURL_INC@
+CURL_LIBS = @CURL_LIBS@
+
 .SUFFIXES:    .c .cpp   .lo