From 6f9baa7b51e231518ebd6e16f4b0ade96c44f6b5 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 11 Jun 2011 23:00:00 +0200 Subject: [PATCH] Remove Ingres and DBI backends --- bacula/src/cats/Makefile.in | 84 ++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in index 66bf4b2b46..fe5d9af078 100644 --- a/bacula/src/cats/Makefile.in +++ b/bacula/src/cats/Makefile.in @@ -12,7 +12,7 @@ topdir = ../.. thisdir = src/cats DEFS += -D_BDB_PRIV_INTERFACE_ -CPPFLAGS += @DBI_DBD_DRIVERDIR@ +#CPPFLAGS += @DBI_DBD_DRIVERDIR@ DEBUG=@DEBUG@ MKDIR=$(topdir)/autoconf/mkinstalldirs @@ -43,23 +43,23 @@ 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) +#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 -DBI_OBJS = $(DBI_SRCS:.c=.o) -DBI_LOBJS = $(DBI_SRCS:.c=.lo) +#DBI_INCLUDE = @DBI_INCLUDE@ +#DBI_LIBS = @DBI_LIBS@ +#DBI_SRCS = dbi.c +#DBI_OBJS = $(DBI_SRCS:.c=.o) +#DBI_LOBJS = $(DBI_SRCS:.c=.lo) DB_LIBS=@DB_LIBS@ -CATS_SRCS = mysql.c postgresql.c sqlite.c dbi.c ingres.c myingres.c +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_glue.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) @@ -92,13 +92,13 @@ $(SQLITE_LOBJS): @echo "Compiling $(@:.lo=.c)" $(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(SQLITE_INCLUDE) $(DINCLUDE) $(CFLAGS) $(@:.lo=.c) -$(DBI_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) +#$(DBI_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) +#$(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)" @@ -112,23 +112,23 @@ $(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) +#$(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) +#$(DBI_OBJS): +# @echo "Compiling $(@:.o=.c)" +# $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DBI_INCLUDE) $(DINCLUDE) $(CFLAGS) $(@:.o=.c) #------------------------------------------------------------------------- all: Makefile libbacsql$(DEFAULT_ARCHIVE_TYPE) libbaccats$(DEFAULT_ARCHIVE_TYPE) @SHARED_CATALOG_TARGETS@ @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 +#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 $@ ..." @@ -160,13 +160,13 @@ 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) $(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) $(INGRES_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) $(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) $(DBI_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) $(DBI_LIBS) Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ @@ -192,8 +192,8 @@ 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_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 @@ -231,7 +231,7 @@ libtool-install: all $(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbaccats-$${db_type}.la $(DESTDIR)$(libdir); \ done $(CP) $(DESTDIR)$(libdir)/libbaccats-@DEFAULT_DB_TYPE@-$(LIBBACCATS_LT_RELEASE).so \ - $(DESTDIR)$(libdir)/libbaccats-$(LIBBACCATS_LT_RELEASE).so + $(DESTDIR)$(libdir)/libbaccats-$(LIBBACCATS_LT_RELEASE).so libtool-uninstall: $(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacsql.la @@ -330,9 +330,9 @@ depend: @for src in $(SQLITE_SRCS); do \ $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) $(DEFS) -I$(srcdir) -I$(basedir) $(SQLITE_INCLUDE) $$src >> Makefile; \ done - @for src in $(DBI_SRCS); do \ - $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) $(DEFS) -I$(srcdir) -I$(basedir) $(DBI_INCLUDE) $$src >> Makefile; \ - done +# @for src in $(DBI_SRCS); do \ +# $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) $(DEFS) -I$(srcdir) -I$(basedir) $(DBI_INCLUDE) $$src >> Makefile; \ +# done @if test -f Makefile ; then \ $(RMF) Makefile.bak; \ else \ -- 2.39.5