Backport from Bacula Enterprise

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

diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in
index 7a4f20ae48286ee9bdba5c52f601fe2dcf4d6710..22d10b850e8c757fbde5a03504ece41cb49f2c30 100644 (file)
--- a/bacula/src/cats/Makefile.in
+++ b/bacula/src/cats/Makefile.in
@@ -1,6 +1,6 @@
 #
-# Author: Kern Sibbald
-# License: LGPLv3
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
 #
 @MCOMMON@
 
@@ -14,8 +14,8 @@ topdir = ../..
 # this dir relative to top dir
 thisdir = src/cats
 
-DEFS += -D_BDB_PRIV_INTERFACE_
-#CPPFLAGS += @DBI_DBD_DRIVERDIR@
+#CPPFLAGS += -DCATS_PRIVATE_DBI @DBI_DBD_DRIVERDIR@
+CPPFLAGS += -DCATS_PRIVATE_DBI
 
 DEBUG=@DEBUG@
 MKDIR=$(topdir)/autoconf/mkinstalldirs
@@ -46,12 +46,6 @@ SQLITE_SRCS = sqlite.c
 SQLITE_OBJS = $(SQLITE_SRCS:.c=.o)
 SQLITE_LOBJS = $(SQLITE_SRCS:.c=.lo)
 
-#INGRES_INCLUDE = @INGRES_INCLUDE@
-#INGRES_LIBS = @INGRES_LIBS@
-#INGRES_SRCS = ingres.c myingres.c
-#INGRES_OBJS = $(INGRES_SRCS:.c=.o)
-#INGRES_LOBJS = $(INGRES_SRCS:.c=.lo)
-
 #DBI_INCLUDE = @DBI_INCLUDE@
 #DBI_LIBS = @DBI_LIBS@
 #DBI_SRCS = dbi.c
@@ -62,7 +56,7 @@ DB_LIBS=@DB_LIBS@
 
 CATS_SRCS  = mysql.c postgresql.c sqlite.c
 LIBBACSQL_SRCS = bvfs.c cats.c sql.c sql_cmds.c sql_create.c sql_delete.c \
-                sql_find.c sql_get.c sql_glue.c sql_list.c sql_update.c
+                sql_find.c sql_get.c sql_list.c sql_update.c
 LIBBACSQL_OBJS = $(LIBBACSQL_SRCS:.c=.o)
 LIBBACCATS_OBJS = $(CATS_SRCS:.c=.o)
 LIBBACSQL_LOBJS = $(LIBBACSQL_SRCS:.c=.lo)
@@ -99,10 +93,6 @@ $(SQLITE_LOBJS):
 #       @echo "Compiling $(@:.lo=.c)"
 #       $(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DBI_INCLUDE) $(DINCLUDE) $(CFLAGS) $(@:.lo=.c)
 
-#$(INGRES_LOBJS):
-#       @echo "Compiling $(@:.lo=.c)"
-#       $(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(INGRES_INCLUDE) $(DINCLUDE) $(CFLAGS) $(@:.lo=.c)
-
 $(MYSQL_OBJS):
        @echo "Compiling $(@:.o=.c)"
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(MYSQL_INCLUDE) $(DINCLUDE) $(CFLAGS) $(@:.o=.c)
@@ -115,10 +105,6 @@ $(SQLITE_OBJS):
        @echo "Compiling $(@:.o=.c)"
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(SQLITE_INCLUDE) $(DINCLUDE) $(CFLAGS) $(@:.o=.c)
 
-#$(INGRES_OBJS):
-#       @echo "Compiling $(@:.o=.c)"
-#       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(INGRES_INCLUDE) $(DINCLUDE) $(CFLAGS) $(@:.o=.c)
-
 #$(DBI_OBJS):
 #       @echo "Compiling $(@:.o=.c)"
 #       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DBI_INCLUDE) $(DINCLUDE) $(CFLAGS) $(@:.o=.c)
@@ -127,12 +113,6 @@ all: Makefile libbacsql$(DEFAULT_ARCHIVE_TYPE) libbaccats$(DEFAULT_ARCHIVE_TYPE)
        @echo "==== Make of sqllibs is good ===="
        @echo " "
 
-#esql:
-#       @echo "Generating myingres.c from myingres.sc"
-#       $(NO_ECHO)$(II_SYSTEM)/ingres/bin/esqlcc -multi -extension=c myingres.sc
-#       @echo "Generating myingres.h from myingres.sh"
-#       $(NO_ECHO)$(II_SYSTEM)/ingres/bin/esqlcc -extension=h myingres.sh
-
 libbacsql.a: $(LIBBACSQL_OBJS)
        @echo "Making $@ ..."
        $(AR) rc  $@ $(LIBBACSQL_OBJS)
@@ -147,9 +127,9 @@ libbacsql.la: Makefile $(LIBBACSQL_LOBJS)
        @echo "Making $@ ..."     
        $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_RELEASE) $(DB_LIBS)
 
-libbaccats.la: Makefile cats_dummy.lo
+libbaccats.la: Makefile cats_null.lo
        @echo "Making $@ ..."
-       $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE)
+       $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_null.lo -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE)
 
 libbaccats-mysql.la: Makefile $(MYSQL_LOBJS)
        @echo "Making $@ ..."
@@ -165,12 +145,6 @@ libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS)
        @echo "Making $@ ..."
        $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
                                                           -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS)
-
-#libbaccats-ingres.la: Makefile $(INGRES_LOBJS)
-#       @echo "Making $@ ..."
-#       $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(INGRES_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
-#                                                          -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(INGRES_LIBS)
-
 #libbaccats-dbi.la: Makefile $(DBI_LOBJS)
 #       @echo "Making $@ ..."
 #       $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(DBI_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
@@ -200,16 +174,13 @@ realclean: clean
        $(RMF) create_postgresql_database  update_postgresql_tables make_postgresql_tables
        $(RMF) grant_postgresql_privileges drop_postgresql_tables   drop_postgresql_database
 
-       $(RMF) create_ingres_database update_ingres_tables make_ingres_tables
-       $(RMF) grant_ingres_privileges drop_ingres_tables   drop_ingres_database
-
        $(RMF) create_sqlite_database      update_sqlite_tables     make_sqlite_tables
        $(RMF) grant_sqlite_privileges     drop_sqlite_tables       drop_sqlite_database
 
        $(RMF) create_sqlite3_database     update_sqlite3_tables     make_sqlite3_tables
        $(RMF) grant_sqlite3_privileges    drop_sqlite3_tables      drop_sqlite3_database
 
-       $(RMF) mysql sqlite postgresql ingres
+       $(RMF) mysql sqlite postgresql
        $(RMF) make_catalog_backup make_catalog_backup.pl delete_catalog_backup
 
 distclean: realclean
@@ -322,7 +293,6 @@ uninstall: @LIBTOOL_UNINSTALL_TARGET@ @INCLUDE_UNINSTALL_TARGET@
 # and it also includes system headers.
 # `semi'-automatic since dependencies are generated at distribution time.
 
-#depend: esql  <-  SRE: if generating from 'real' ingres source
 depend: 
        @$(MV) Makefile Makefile.bak
        @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile