ebl Modify disk-changer to check if slot contains something before

[bacula/bacula] / bacula / src / cats / Makefile.in

diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in
index 3372a5172516194015b59220d5ff402005bb6929..d137ca452c0a2a4641db780f88044c3e5b2770fd 100644 (file)
--- a/bacula/src/cats/Makefile.in
+++ b/bacula/src/cats/Makefile.in
@@ -11,6 +11,8 @@ topdir = ../..
 # this dir relative to top dir
 thisdir = src/cats
 
+CPPFLAGS += -DBUILDING_CATS @DBI_DBD_DRIVERDIR@
+
 DEBUG=@DEBUG@
 MKDIR=$(topdir)/autoconf/mkinstalldirs
 
@@ -23,14 +25,12 @@ dummy:
 SVRSRCS = cats.c sql.c
 SVROBJS = cats.o sql.o
 
-LIBSRCS = mysql.c bdb.c bdb_create.c bdb_get.c bdb_update.c \
-         bdb_delete.c bdb_find.c bdb_list.c \
-         sql.c sql_create.c sql_delete.c sql_find.c \
+LIBSRCS = mysql.c bdb.c dbi.c \
+         sql.c sql_cmds.c sql_create.c sql_delete.c sql_find.c \
          sql_get.c sql_list.c sql_update.c sqlite.c \
          postgresql.c
-LIBOBJS = mysql.o bdb.o bdb_create.o bdb_get.o bdb_update.o \
-         bdb_delete.o bdb_find.o bdb_list.o \
-         sql.o sql_create.o sql_delete.o sql_find.o \
+LIBOBJS = mysql.o bdb.o dbi.o \
+         sql.o sql_cmds.o sql_create.o sql_delete.o sql_find.o \
          sql_get.o sql_list.o sql_update.o sqlite.o \
          postgresql.o
 
@@ -40,13 +40,15 @@ LIBOBJS = mysql.o bdb.o bdb_create.o bdb_get.o bdb_update.o \
 
 # inference rules
 .c.o:
-       $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(SQL_INC) $(DINCLUDE) $(CFLAGS) $<
+       @echo "Compiling $<"
+       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(SQL_INC) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
 all: Makefile libsql.a
        @echo "==== Make of cats is good ===="
        @echo " "
 
 libsql.a: $(LIBOBJS)
+       @echo "Making $@ ..."     
        $(AR) rc  $@ $(LIBOBJS)
        $(RANLIB) $@
 
@@ -79,24 +81,27 @@ realclean: clean
        $(RMF) create_sqlite_database      update_sqlite_tables     make_sqlite_tables
        $(RMF) grant_sqlite_privileges     drop_sqlite_tables       drop_sqlite_database
 
-       $(RMF) mysql sqlite
+       $(RMF) create_sqlite3_database     update_sqlite3_tables     make_sqlite3_tables
+       $(RMF) grant_sqlite3_privileges    drop_sqlite3_tables      drop_sqlite3_database
+
+       $(RMF) mysql sqlite postgresql
        $(RMF) make_catalog_backup delete_catalog_backup
 
 distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
-       (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
+       (cd $(srcdir); $(RMF) Makefile)
 
 devclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile)
 
 install:
-       $(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(scriptdir)/create_@DB_NAME@_database
-       $(INSTALL_SCRIPT) update_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/update_@DB_NAME@_tables
-       $(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/make_@DB_NAME@_tables
-       $(INSTALL_SCRIPT) grant_@DB_NAME@_privileges $(DESTDIR)$(scriptdir)/grant_@DB_NAME@_privileges
-       $(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_tables
-       $(INSTALL_SCRIPT) drop_@DB_NAME@_database $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_database
+       $(INSTALL_SCRIPT) create_@DB_TYPE@_database $(DESTDIR)$(scriptdir)/create_@DB_TYPE@_database
+       $(INSTALL_SCRIPT) update_@DB_TYPE@_tables $(DESTDIR)$(scriptdir)/update_@DB_TYPE@_tables
+       $(INSTALL_SCRIPT) make_@DB_TYPE@_tables $(DESTDIR)$(scriptdir)/make_@DB_TYPE@_tables
+       $(INSTALL_SCRIPT) grant_@DB_TYPE@_privileges $(DESTDIR)$(scriptdir)/grant_@DB_TYPE@_privileges
+       $(INSTALL_SCRIPT) drop_@DB_TYPE@_tables $(DESTDIR)$(scriptdir)/drop_@DB_TYPE@_tables
+       $(INSTALL_SCRIPT) drop_@DB_TYPE@_database $(DESTDIR)$(scriptdir)/drop_@DB_TYPE@_database
 
        $(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(scriptdir)/create_bacula_database
        $(INSTALL_SCRIPT) update_bacula_tables $(DESTDIR)$(scriptdir)/update_bacula_tables
@@ -125,12 +130,12 @@ install:
           ${INSTALL_SCRIPT} $$filename ${DESTDIR}${scriptdir}/$$destname
 
 uninstall:
-       (cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database)
-       (cd $(DESTDIR)$(scriptdir); $(RMF) update_@DB_NAME@_tables)
-       (cd $(DESTDIR)$(scriptdir); $(RMF) make_@DB_NAME@_tables)
-       (cd $(DESTDIR)$(scriptdir); $(RMF) grant_@DB_NAME@_privileges)
-       (cd $(DESTDIR)$(scriptdir); $(RMF) drop_@DB_NAME@_tables)
-       (cd $(DESTDIR)$(scriptdir); $(RMF) drop_@DB_NAME@_database)
+       (cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_TYPE@_database)
+       (cd $(DESTDIR)$(scriptdir); $(RMF) update_@DB_TYPE@_tables)
+       (cd $(DESTDIR)$(scriptdir); $(RMF) make_@DB_TYPE@_tables)
+       (cd $(DESTDIR)$(scriptdir); $(RMF) grant_@DB_TYPE@_privileges)
+       (cd $(DESTDIR)$(scriptdir); $(RMF) drop_@DB_TYPE@_tables)
+       (cd $(DESTDIR)$(scriptdir); $(RMF) drop_@DB_TYPE@_database)
 
        (cd $(DESTDIR)$(scriptdir); $(RMF) create_bacula_database)
        (cd $(DESTDIR)$(scriptdir); $(RMF) update_bacula_tables)
@@ -157,7 +162,7 @@ depend:
            $(RMF) Makefile.bak; \
        else \
           $(MV) Makefile.bak Makefile; \
-          echo -e "Something went wrong\n\a"; \
+          echo " ===== Something went wrong in make depend ====="; \
        fi
 
 # -----------------------------------------------------------------------