From: Kern Sibbald Date: Thu, 25 Sep 2008 14:04:17 +0000 (+0000) Subject: Add src/plugins/fd/Makefile to ./configure process X-Git-Tag: Release-7.0.0~4094 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=180c697343a82985eb682b03b4ecd91c9a69418a;p=bacula%2Fbacula Add src/plugins/fd/Makefile to ./configure process git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7638 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/autoconf/aclocal.m4 b/bacula/autoconf/aclocal.m4 index b5d313a1ea..4552e2b4e3 100644 --- a/bacula/autoconf/aclocal.m4 +++ b/bacula/autoconf/aclocal.m4 @@ -40,8 +40,8 @@ m4_include([gettext-macros/ulonglong.m4]) m4_include([gettext-macros/wchar_t.m4]) m4_include([gettext-macros/wint_t.m4]) m4_include([gettext-macros/xsize.m4]) +m4_include([bacula-macros/compare-version.m4]) m4_include([bacula-macros/db.m4]) m4_include([bacula-macros/largefiles.m4]) -m4_include([bacula-macros/os.m4]) -m4_include([bacula-macros/compare-version.m4]) m4_include([bacula-macros/libdb.m4]) +m4_include([bacula-macros/os.m4]) diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in index 1e3b2fd480..6f9e2f7fa8 100644 --- a/bacula/autoconf/config.h.in +++ b/bacula/autoconf/config.h.in @@ -2,9 +2,6 @@ /* ------------------------------------------------------------------------- */ /* -- CONFIGURE SPECIFIED FEATURES -- */ /* ------------------------------------------------------------------------- */ - -/* Define if you want to use Berkeley DB as accurate backend */ -#undef USE_DB /* Define if you want to use MySQL as Catalog database */ #undef USE_MYSQL_DB @@ -308,6 +305,9 @@ /* Set if you have the DBI driver */ #undef HAVE_DBI +/* Define to 1 if you have the header file. */ +#undef HAVE_DB_H + /* Define if the GNU dcgettext() function is already present or preinstalled. */ #undef HAVE_DCGETTEXT @@ -870,6 +870,9 @@ /* Define to 1 if your declares `struct tm'. */ #undef TM_IN_SYS_TIME +/* Set if DB Berkeley is used for accurate backup */ +#undef USE_DB + /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 67741afa59..1c45c017c1 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -1281,9 +1281,9 @@ AC_SUBST(db_password) # db_port=" " AC_ARG_WITH(db_port, - [ --with-db-port=DBPORT specify a database port (default null)], + [ --with-db-port=DBPORT specify a database port (default null)], [ - if test "x$withval" != "x" ; then + if test "x$withval" != "x" ; then db_port=$withval fi ] @@ -2356,6 +2356,7 @@ AC_OUTPUT([autoconf/Make.common \ src/cats/drop_bacula_database \ src/findlib/Makefile \ src/tools/Makefile \ + src/plugins/fd/Makefile \ po/Makefile.in \ updatedb/update_mysql_tables_10_to_11 \ updatedb/update_sqlite3_tables_10_to_11 \ @@ -2472,70 +2473,70 @@ fi echo " Configuration on `date`: - Host: $host -- ${DISTNAME} ${DISTVER} - Bacula version: ${VERSION} (${DATE}) + Host: $host -- ${DISTNAME} ${DISTVER} + Bacula version: ${VERSION} (${DATE}) Source code location: ${srcdir} - Install binaries: ${sbindir} + Install binaries: ${sbindir} Install config files: ${sysconfdir} - Scripts directory: ${scriptdir} - Archive directory: ${archivedir} - Working directory: ${working_dir} - PID directory: ${piddir} - Subsys directory: ${subsysdir} - Man directory: ${mandir} - Data directory: ${datadir} - C Compiler: ${CC} ${CCVERSION} - C++ Compiler: ${CXX} ${CXXVERSION} - Compiler flags: ${WCFLAGS} ${CFLAGS} - Linker flags: ${WLDFLAGS} ${LDFLAGS} - Libraries: ${LIBS} + Scripts directory: ${scriptdir} + Archive directory: ${archivedir} + Working directory: ${working_dir} + PID directory: ${piddir} + Subsys directory: ${subsysdir} + Man directory: ${mandir} + Data directory: ${datadir} + C Compiler: ${CC} ${CCVERSION} + C++ Compiler: ${CXX} ${CXXVERSION} + Compiler flags: ${WCFLAGS} ${CFLAGS} + Linker flags: ${WLDFLAGS} ${LDFLAGS} + Libraries: ${LIBS} Statically Linked Tools: ${support_static_tools} Statically Linked FD: ${support_static_fd} Statically Linked SD: ${support_static_sd} Statically Linked DIR: ${support_static_dir} Statically Linked CONS: ${support_static_cons} - Database type: ${db_type} - Database port: ${db_port} - Database lib: ${DB_LIBS} - Database name: ${db_name} - Database user: ${db_user} - - Job Output Email: ${job_email} - Traceback Email: ${dump_email} - SMTP Host Address: ${smtp_host} - - Director Port: ${dir_port} - File daemon Port: ${fd_port} - Storage daemon Port: ${sd_port} - - Director User: ${dir_user} - Director Group: ${dir_group} - Storage Daemon User: ${sd_user} - Storage DaemonGroup: ${sd_group} - File Daemon User: ${fd_user} - File Daemon Group: ${fd_group} + Database type: ${db_type} + Database port: ${db_port} + Database lib: ${DB_LIBS} + Database name: ${db_name} + Database user: ${db_user} + + Job Output Email: ${job_email} + Traceback Email: ${dump_email} + SMTP Host Address: ${smtp_host} + + Director Port: ${dir_port} + File daemon Port: ${fd_port} + Storage daemon Port: ${sd_port} + + Director User: ${dir_user} + Director Group: ${dir_group} + Storage Daemon User: ${sd_user} + Storage DaemonGroup: ${sd_group} + File Daemon User: ${fd_user} + File Daemon Group: ${fd_group} SQL binaries Directory ${SQL_BINDIR} - Large file support: $largefile_support + Large file support: $largefile_support Bacula conio support: ${got_conio} ${CONS_LIBS} - readline support: ${got_readline} ${PRTREADLINE_SRC} + readline support: ${got_readline} ${PRTREADLINE_SRC} TCP Wrappers support: ${TCPW_MSG} ${WRAPLIBS} - TLS support: ${support_tls} - Encryption support: ${support_crypto} - ZLIB support: ${have_zlib} - enable-smartalloc: ${support_smartalloc} - bat support: ${support_bat} ${QWT_LDFLAGS} - enable-gnome: ${support_gnome} ${gnome_version} - enable-bwx-console: ${support_wx_console} ${wx_version} - enable-tray-monitor: ${support_tray_monitor} - client-only: ${build_client_only} - build-dird: ${build_dird} - build-stored: ${build_stored} - ACL support: ${have_acl} - Python support: ${support_python} ${PYTHON_LIBS} + TLS support: ${support_tls} + Encryption support: ${support_crypto} + ZLIB support: ${have_zlib} + enable-smartalloc: ${support_smartalloc} + bat support: ${support_bat} ${QWT_LDFLAGS} + enable-gnome: ${support_gnome} ${gnome_version} + enable-bwx-console: ${support_wx_console} ${wx_version} + enable-tray-monitor: ${support_tray_monitor} + client-only: ${build_client_only} + build-dird: ${build_dird} + build-stored: ${build_stored} + ACL support: ${have_acl} + Python support: ${support_python} ${PYTHON_LIBS} Batch insert enabled: ${support_batch_insert} - Berkeley DB support: ${support_libdb} ${BDB_LIBS} + Berkeley DB support: ${support_libdb} ${BDB_LIBS} " > config.out diff --git a/bacula/configure b/bacula/configure index c4c1ca7816..1b847dc554 100755 --- a/bacula/configure +++ b/bacula/configure @@ -1521,7 +1521,7 @@ Optional Packages: --with-db-name=DBNAME specify database name (default bacula) --with-db-user=UNAME specify database user (default bacula) --with-db-password=UNAME specify database password (default *none*) - --with-db-port=DBPORT specify a database port (default null) + --with-db-port=DBPORT specify a database port (default null) --with-dir-user=USER specify user for Director daemon --with-dir-group=GROUP specify group for Director daemon --with-sd-user=USER specify user for Storage daemon @@ -21350,7 +21350,7 @@ db_port=" " # Check whether --with-db_port was given. if test "${with_db_port+set}" = set; then withval=$with_db_port; - if test "x$withval" != "x" ; then + if test "x$withval" != "x" ; then db_port=$withval fi @@ -34750,7 +34750,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi -ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile po/Makefile.in updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES" +ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile po/Makefile.in updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES" ac_config_commands="$ac_config_commands default" @@ -35425,6 +35425,7 @@ do "src/cats/drop_bacula_database") CONFIG_FILES="$CONFIG_FILES src/cats/drop_bacula_database" ;; "src/findlib/Makefile") CONFIG_FILES="$CONFIG_FILES src/findlib/Makefile" ;; "src/tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/Makefile" ;; + "src/plugins/fd/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/fd/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "updatedb/update_mysql_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_mysql_tables_10_to_11" ;; "updatedb/update_sqlite3_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite3_tables_10_to_11" ;; @@ -36498,70 +36499,70 @@ fi echo " Configuration on `date`: - Host: $host -- ${DISTNAME} ${DISTVER} - Bacula version: ${VERSION} (${DATE}) + Host: $host -- ${DISTNAME} ${DISTVER} + Bacula version: ${VERSION} (${DATE}) Source code location: ${srcdir} - Install binaries: ${sbindir} + Install binaries: ${sbindir} Install config files: ${sysconfdir} - Scripts directory: ${scriptdir} - Archive directory: ${archivedir} - Working directory: ${working_dir} - PID directory: ${piddir} - Subsys directory: ${subsysdir} - Man directory: ${mandir} - Data directory: ${datadir} - C Compiler: ${CC} ${CCVERSION} - C++ Compiler: ${CXX} ${CXXVERSION} - Compiler flags: ${WCFLAGS} ${CFLAGS} - Linker flags: ${WLDFLAGS} ${LDFLAGS} - Libraries: ${LIBS} + Scripts directory: ${scriptdir} + Archive directory: ${archivedir} + Working directory: ${working_dir} + PID directory: ${piddir} + Subsys directory: ${subsysdir} + Man directory: ${mandir} + Data directory: ${datadir} + C Compiler: ${CC} ${CCVERSION} + C++ Compiler: ${CXX} ${CXXVERSION} + Compiler flags: ${WCFLAGS} ${CFLAGS} + Linker flags: ${WLDFLAGS} ${LDFLAGS} + Libraries: ${LIBS} Statically Linked Tools: ${support_static_tools} Statically Linked FD: ${support_static_fd} Statically Linked SD: ${support_static_sd} Statically Linked DIR: ${support_static_dir} Statically Linked CONS: ${support_static_cons} - Database type: ${db_type} - Database port: ${db_port} - Database lib: ${DB_LIBS} - Database name: ${db_name} - Database user: ${db_user} - - Job Output Email: ${job_email} - Traceback Email: ${dump_email} - SMTP Host Address: ${smtp_host} - - Director Port: ${dir_port} - File daemon Port: ${fd_port} - Storage daemon Port: ${sd_port} - - Director User: ${dir_user} - Director Group: ${dir_group} - Storage Daemon User: ${sd_user} - Storage DaemonGroup: ${sd_group} - File Daemon User: ${fd_user} - File Daemon Group: ${fd_group} + Database type: ${db_type} + Database port: ${db_port} + Database lib: ${DB_LIBS} + Database name: ${db_name} + Database user: ${db_user} + + Job Output Email: ${job_email} + Traceback Email: ${dump_email} + SMTP Host Address: ${smtp_host} + + Director Port: ${dir_port} + File daemon Port: ${fd_port} + Storage daemon Port: ${sd_port} + + Director User: ${dir_user} + Director Group: ${dir_group} + Storage Daemon User: ${sd_user} + Storage DaemonGroup: ${sd_group} + File Daemon User: ${fd_user} + File Daemon Group: ${fd_group} SQL binaries Directory ${SQL_BINDIR} - Large file support: $largefile_support + Large file support: $largefile_support Bacula conio support: ${got_conio} ${CONS_LIBS} - readline support: ${got_readline} ${PRTREADLINE_SRC} + readline support: ${got_readline} ${PRTREADLINE_SRC} TCP Wrappers support: ${TCPW_MSG} ${WRAPLIBS} - TLS support: ${support_tls} - Encryption support: ${support_crypto} - ZLIB support: ${have_zlib} - enable-smartalloc: ${support_smartalloc} - bat support: ${support_bat} ${QWT_LDFLAGS} - enable-gnome: ${support_gnome} ${gnome_version} - enable-bwx-console: ${support_wx_console} ${wx_version} - enable-tray-monitor: ${support_tray_monitor} - client-only: ${build_client_only} - build-dird: ${build_dird} - build-stored: ${build_stored} - ACL support: ${have_acl} - Python support: ${support_python} ${PYTHON_LIBS} + TLS support: ${support_tls} + Encryption support: ${support_crypto} + ZLIB support: ${have_zlib} + enable-smartalloc: ${support_smartalloc} + bat support: ${support_bat} ${QWT_LDFLAGS} + enable-gnome: ${support_gnome} ${gnome_version} + enable-bwx-console: ${support_wx_console} ${wx_version} + enable-tray-monitor: ${support_tray_monitor} + client-only: ${build_client_only} + build-dird: ${build_dird} + build-stored: ${build_stored} + ACL support: ${have_acl} + Python support: ${support_python} ${PYTHON_LIBS} Batch insert enabled: ${support_batch_insert} - Berkeley DB support: ${support_libdb} ${BDB_LIBS} + Berkeley DB support: ${support_libdb} ${BDB_LIBS} " > config.out diff --git a/bacula/src/plugins/fd/Makefile b/bacula/src/plugins/fd/Makefile index ebc7fb0fed..8fcbeda10c 100644 --- a/bacula/src/plugins/fd/Makefile +++ b/bacula/src/plugins/fd/Makefile @@ -1,9 +1,99 @@ # # Simple Makefile for building test FD plugins for Bacula # +# Version $Id: $ +# +# +# This file is pulled in by all the Unix Bacula Makefiles +# so it has all the "common" definitions +# + +DATE="24 September 2008" +LSMDATE=24Sep08 +VERSION=2.5.3 +VERNAME=bacula-$(VERSION)# +MAINT=Kern Sibbald# +MAINTEMAIL=# +WEBMAINT=# +WEBMAINTEMAIL=# +WEBPAGE=# +FTPSITENAME=# +FTPSITEDIR=# +#------------------------------------------------------------------------- + +SHELL = /bin/sh + +# Installation target directories & other installation stuff +prefix = +exec_prefix = +binprefix = +manprefix = +datarootdir = ${prefix}/share +sbindir = /home/kern/bacula/bin +sysconfdir = /home/kern/bacula/bin +scriptdir = /home/kern/bacula/bin +mandir = /home/kern/bacula/bin +manext = 8 + +NO_ECHO = @ + +# Tools & program stuff +CC = gcc +CPP = gcc -E +CXX = /usr/bin/g++ +MV = /bin/mv +RM = /bin/rm +RMF = /bin/rm -f +CP = /bin/cp +SED = /bin/sed +AWK = /usr/bin/mawk +ECHO = /bin/echo +CMP = /usr/bin/cmp +TBL = /usr/bin/tbl +AR = /usr/bin/ar +RANLIB = ranlib +MKDIR = /home/kern/bacula/k/autoconf/mkinstalldirs +INSTALL = /usr/bin/install -c +# add the -s to the following in PRODUCTION mode +INSTALL_PROGRAM = /usr/bin/install -c -m 0754 +INSTALL_DATA = /usr/bin/install -c -m 644 +INSTALL_SCRIPT = /usr/bin/install -c -m 0754 +INSTALL_CONFIG = /usr/bin/install -c -m 640 + +# Flags & libs +CFLAGS = -g -O2 -Wall -fno-strict-aliasing -fno-exceptions -fno-rtti + +CPPFLAGS = -fno-strict-aliasing -fno-exceptions -fno-rtti +LDFLAGS = +TTOOL_LDFLAGS = +#DEFS = -DHAVE_CONFIG_H +LIBS = -lpthread -ldl +WRAPLIBS = -lwrap +DINCLUDE = +DLIB = +DB_LIBS = -L/home/kern/bacula/depkgs/sqlite3 -lsqlite3 +PYTHON_LIBS = -L/usr/lib/python2.5/config -lpython2.5 -lutil -lrt +PYTHON_INC = -I/usr/include/python2.5 +OPENSSL_LIBS = -lssl -lcrypto +BDB_CPPFLAGS = +BDB_LIBS = + + +# Windows (cygwin) flags +WCFLAGS = +WLDFLAGS = + +# X Include directory +#XINC = @XPM_CFLAGS@ + +# extra libraries needed by X on some systems, X library location +#XLIB = @XPM_LIBS@ -lX11 + +# End of common section of the Makefile +#------------------------------------------------------------------------- + # No optimization for now for easy debugging -CC = g++ -g -O0 -Wall FDDIR=../../filed SRCDIR=../.. @@ -11,29 +101,29 @@ LIBDIR=../../lib .SUFFIXES: .c .o .c.o: - $(CC) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c $< + $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c $< all: bpipe-fd.so test: main example-plugin-fd.so fd_plugins.o: ${FDDIR}/fd_plugins.h ${FDDIR}/fd_plugins.c - $(CC) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c ${FDDIR}/fd_plugins.c + $(CXX) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c ${FDDIR}/fd_plugins.c main: fd_plugins.o - $(CC) -L${LIBDIR} fd_plugins.o -o main -lbac -lpthread -lssl -l crypto -ldl + $(CXX) $(LDFLAGS) -L${LIBDIR} fd_plugins.o -o main -lbac -lpthread -lssl -l crypto -ldl example-plugin-fd.o: example-plugin-fd.c ${FDDIR}/fd_plugins.h - $(CC) -fPIC -I../.. -I${FDDIR} -c example-plugin-fd.c + $(CXX) -fPIC -I../.. -I${FDDIR} -c example-plugin-fd.c example-plugin-fd.so: example-plugin-fd.o - $(CC) -shared example-plugin-fd.o -o example-plugin-fd.so + $(CXX) $(LDFLAGS) -shared example-plugin-fd.o -o example-plugin-fd.so bpipe-fd.o: bpipe-fd.c ${FDDIR}/fd_plugins.h - $(CC) -fPIC -I../.. -I${FDDIR} -c bpipe-fd.c + $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) -fPIC -I../.. -I${FDDIR} -c bpipe-fd.c bpipe-fd.so: bpipe-fd.o - $(CC) -shared bpipe-fd.o -o bpipe-fd.so + $(CXX) $(LDFLAGS) -shared bpipe-fd.o -o bpipe-fd.so clean: rm -f main *.so *.o 1 2 3 diff --git a/bacula/src/plugins/fd/Makefile.in b/bacula/src/plugins/fd/Makefile.in new file mode 100644 index 0000000000..8305b6a5db --- /dev/null +++ b/bacula/src/plugins/fd/Makefile.in @@ -0,0 +1,42 @@ +# +# Simple Makefile for building test FD plugins for Bacula +# +# Version $Id$ +# +@MCOMMON@ + + +# No optimization for now for easy debugging + +FDDIR=../../filed +SRCDIR=../.. +LIBDIR=../../lib + +.SUFFIXES: .c .o +.c.o: + $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c $< + +all: bpipe-fd.so + +test: main example-plugin-fd.so + +fd_plugins.o: ${FDDIR}/fd_plugins.h ${FDDIR}/fd_plugins.c + $(CXX) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c ${FDDIR}/fd_plugins.c + +main: fd_plugins.o + $(CXX) $(LDFLAGS) -L${LIBDIR} fd_plugins.o -o main -lbac -lpthread -lssl -l crypto -ldl + +example-plugin-fd.o: example-plugin-fd.c ${FDDIR}/fd_plugins.h + $(CXX) -fPIC -I../.. -I${FDDIR} -c example-plugin-fd.c + +example-plugin-fd.so: example-plugin-fd.o + $(CXX) $(LDFLAGS) -shared example-plugin-fd.o -o example-plugin-fd.so + +bpipe-fd.o: bpipe-fd.c ${FDDIR}/fd_plugins.h + $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) -fPIC -I../.. -I${FDDIR} -c bpipe-fd.c + +bpipe-fd.so: bpipe-fd.o + $(CXX) $(LDFLAGS) -shared bpipe-fd.o -o bpipe-fd.so + +clean: + rm -f main *.so *.o 1 2 3 diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5 index 51c7c63188..07024eff73 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -19,6 +19,7 @@ remove reader/writer in FOPTS???? General: 25Sep08 +kes Add src/plugins/fd/Makefile to ./configure process. kes Make first cut attempt to correct SQL that computes the current Pool usage. This is to fix bug #1159. kes Do a bunch of plugin cleanups for Win32 and more careful checking