X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fcats%2FMakefile.in;h=8016395416bb353c560b8455f03d7f34bdfbb89b;hb=2e4dda4e9896641ba48d0a52be97fbc825795d39;hp=3be938d7cf314713b7f18b3e10aaf5fa8ef89811;hpb=f3b33c863e725b60b4e3fe1930408833e6ccd64e;p=bacula%2Fbacula

diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in
index 3be938d7cf..8016395416 100644
--- a/bacula/src/cats/Makefile.in
+++ b/bacula/src/cats/Makefile.in
@@ -11,7 +11,10 @@ topdir = ../..
 # this dir relative to top dir
 thisdir = src/cats
 
+CPPFLAGS += -DBUILDING_CATS
+
 DEBUG=@DEBUG@
+MKDIR=$(topdir)/autoconf/mkinstalldirs
 
 SQL_INC=@SQL_INCLUDE@
 
@@ -24,12 +27,14 @@ 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 \
-	  sql_get.c sql_list.c sql_update.c sqlite.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 \
-	  sql_get.o sql_list.o sql_update.o sqlite.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
 
 .SUFFIXES:	.c .o
 .PHONY:
@@ -37,18 +42,20 @@ LIBOBJS = mysql.o bdb.o bdb_create.o bdb_get.o bdb_update.o \
 
 # inference rules
 .c.o:
-	$(CXX) $(DEFS) $(DEBUG) -c $(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)
-	$(AR) rcs $@ $(LIBOBJS)
+	@echo "Making $@ ..."	  
+	$(AR) rc  $@ $(LIBOBJS)
 	$(RANLIB) $@
 
 cats: $(SVROBJS) ../findlib/libfind.a
-	$(CC) $(LDFLAGS) -L../findlib -L../lib -o $@ $(SVROBJS) $(LIBS) $(DLIB) -lfind -lbac
+	$(CC) $(WLDFLAGS) $(LDFLAGS) -L../findlib -L../lib -o $@ $(SVROBJS) $(LIBS) $(DB_LIBS) -lfind -lbac
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 	cd $(topdir) \
@@ -60,23 +67,87 @@ clean:
 
 realclean: clean
 	$(RMF) tags
-	$(RMF) make_mysql_tables grant_mysql_privileges drop_mysql_tables
-	$(RMF) create_mysql_database make_sqlite_tables sqlite
-	$(RMF) create_bdb_database drop_bdb_tables make_dbd_tables
+
+	$(RMF) create_bacula_database	   update_bacula_tables     make_bacula_tables
+	$(RMF) grant_bacula_privileges	   drop_bacula_tables	    drop_bacula_database
+
+	$(RMF) create_bdb_database	   update_bdb_tables	    make_bdb_tables
+	$(RMF) grant_bdb_privileges	   drop_bdb_tables	    drop_bdb_database
+
+	$(RMF) create_mysql_database	   update_mysql_tables	    make_mysql_tables
+	$(RMF) grant_mysql_privileges	   drop_mysql_tables	    drop_mysql_database
+
+	$(RMF) create_postgresql_database  update_postgresql_tables make_postgresql_tables
+	$(RMF) grant_postgresql_privileges drop_postgresql_tables   drop_postgresql_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
+	$(RMF) make_catalog_backup delete_catalog_backup
 
 distclean: realclean
 	if test $(srcdir) = .; then $(MAKE) realclean; fi
 	(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)$(sysconfdir)/create_@DB_NAME@_database
-	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(sysconfdir)/drop_@DB_NAME@_tables
-	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(sysconfdir)/make_@DB_NAME@_tables
+	$(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
+	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables
+	$(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(scriptdir)/grant_bacula_privileges
+	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables
+	$(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(scriptdir)/drop_bacula_database
+
+	@filename=make_catalog_backup; \
+	   if  test -f ${DESTDIR}${scriptdir}/$$filename; then \
+	      destname=$$filename.new; \
+	      echo "  ==> Found existing $$filename, installing new file as $$destname"; \
+	   else \
+	      destname=$$filename; \
+	   fi; \
+	   echo "${INSTALL_SCRIPT} $$filename ${DESTDIR}${scriptdir}/$$destname"; \
+	   ${INSTALL_SCRIPT} $$filename ${DESTDIR}${scriptdir}/$$destname
+	@filename=delete_catalog_backup; \
+	   if  test -f ${DESTDIR}${scriptdir}/$$filename; then \
+	      destname=$$filename.new; \
+	      echo "  ==> Found existing $$filename, installing new file as $$destname"; \
+	   else \
+	      destname=$$filename; \
+	   fi; \
+	   echo "${INSTALL_SCRIPT} $$filename ${DESTDIR}${scriptdir}/$$destname"; \
+	   ${INSTALL_SCRIPT} $$filename ${DESTDIR}${scriptdir}/$$destname
 
 uninstall:
-	(cd $(DESTDIR)$(sysconfdir); $(RMF) create_@DB_NAME@_database)
-	(cd $(DESTDIR)$(sysconfdir); $(RMF) drop_@DB_NAME@_tables)
-	(cd $(DESTDIR)$(sysconfdir); $(RMF) make_@DB_NAME@_tables)
+	(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)
+	(cd $(DESTDIR)$(scriptdir); $(RMF) make_bacula_tables)
+	(cd $(DESTDIR)$(scriptdir); $(RMF) grant_bacula_privileges)
+	(cd $(DESTDIR)$(scriptdir); $(RMF) drop_bacula_tables)
+	(cd $(DESTDIR)$(scriptdir); $(RMF) drop_bacula_database)
+
+	(cd $(DESTDIR)$(scriptdir); $(RMF) make_catalog_backup)
+	(cd $(DESTDIR)$(scriptdir); $(RMF) delete_catalog_backup)
 
 
 # Semi-automatic generation of dependencies:
@@ -88,12 +159,12 @@ depend:
 	@$(MV) Makefile Makefile.bak
 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
 	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-	@$(CC) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
+	@$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
 	@if test -f Makefile ; then \
 	    $(RMF) Makefile.bak; \
 	else \
 	   $(MV) Makefile.bak Makefile; \
-	   echo -e "Something went wrong\n\a"; \
+	   echo " ===== Something went wrong in make depend ====="; \
 	fi
 
 # -----------------------------------------------------------------------