X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fcats%2FMakefile.in;h=5ed376f9909edf7ee5d1f5a0556801bf330551f8;hb=7cfdf8e24909421d067ba0e12becb755b36f365b;hp=3730074e4044b1090b85d524866959bc68df9873;hpb=a5521f8f2439ffca6f0af18f52d7587803b90f35;p=bacula%2Fbacula

diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in
index 3730074e40..5ed376f990 100644
--- a/bacula/src/cats/Makefile.in
+++ b/bacula/src/cats/Makefile.in
@@ -11,7 +11,7 @@ topdir = ../..
 # this dir relative to top dir
 thisdir = src/cats
 
-CPPFLAGS += -DBUILDING_CATS
+CPPFLAGS += -DBUILDING_CATS @DBI_DBD_DRIVERDIR@
 
 DEBUG=@DEBUG@
 MKDIR=$(topdir)/autoconf/mkinstalldirs
@@ -22,19 +22,22 @@ first_rule: all
 dummy:
 
 #
-SVRSRCS = cats.c sql.c
-SVROBJS = cats.o sql.o
-
-LIBSRCS = mysql.c bdb.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 \
-	  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
+# include files installed when using libtool
+#
+INCLUDE_FILES = bdb.h cats.h protos.h sql_cmds.h
+
+LIBBACSQL_SRCS = 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 bvfs.c
+LIBBACSQL_OBJS = $(LIBBACSQL_SRCS:.c=.o)
+LIBBACSQL_LOBJS = $(LIBBACSQL_SRCS:.c=.lo)
+
+LIBBACSQL_LT_CURRENT = 1
+LIBBACSQL_LT_REVISION = 0
+LIBBACSQL_LT_AGE = 0
+
+.SUFFIXES:	.c .o .lo
 .PHONY:
 .DONTCARE:
 
@@ -42,26 +45,35 @@ LIBOBJS = mysql.o bdb.o \
 .c.o:
 	@echo "Compiling $<"
 	$(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(SQL_INC) $(DINCLUDE) $(CFLAGS) $<
+
+.c.lo:
+	@echo "Compiling $<"
+	$(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(SQL_INC) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
-all: Makefile libsql.a
-	@echo "==== Make of cats is good ===="
+all: Makefile libbacsql$(DEFAULT_ARCHIVE_TYPE)
+	@echo "==== Make of sqllib is good ===="
 	@echo " "
 
-libsql.a: $(LIBOBJS)
+libbacsql.a: $(LIBBACSQL_OBJS)
 	@echo "Making $@ ..."	  
-	$(AR) rc  $@ $(LIBOBJS)
+	$(AR) rc  $@ $(LIBBACSQL_OBJS)
 	$(RANLIB) $@
 
-cats: $(SVROBJS) ../findlib/libfind.a
-	$(CC) $(WLDFLAGS) $(LDFLAGS) -L../findlib -L../lib -o $@ $(SVROBJS) $(LIBS) $(DB_LIBS) -lfind -lbac
+libbacsql.la: Makefile $(LIBBACSQL_LOBJS)
+	@echo "Making $@ ..."	  
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACSQL_LT_CURRENT):$(LIBBACSQL_LT_REVISION):$(LIBBACSQL_LT_AGE) $(DB_LIBS)
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 	cd $(topdir) \
 	  && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+libtool-clean:
+	@find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF)
+	@$(RMF) *.la
+	@$(RMF) -r .libs _libs
 
-clean:
-	$(RMF) cats core a.out *.o *.a *.bak *~ *.intpro *.extpro 1 2 3
+clean:	libtool-clean
+	@$(RMF) core a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
 
 realclean: clean
 	$(RMF) tags
@@ -95,7 +107,25 @@ devclean: realclean
 	if test $(srcdir) = .; then $(MAKE) realclean; fi
 	(cd $(srcdir); $(RMF) Makefile)
 
-install:
+install-includes:
+	$(MKDIR) $(DESTDIR)/$(includedir)/bacula/sql
+	for I in $(INCLUDE_FILES); do \
+	   $(INSTALL_DATA) $$I $(DESTDIR)$(includedir)/bacula/sql/`basename $$I`; \
+	done
+
+uninstall-includes:
+	for I in $(INCLUDE_FILES); do \
+	   $(RMF) $(DESTDIR)$(includedir)/bacula/sql/`basename $$I`; \
+	done
+
+libtool-install: all
+	$(MKDIR) $(DESTDIR)$(libdir)
+	$(LIBTOOL_INSTALL_FINISH) $(INSTALL_PROGRAM) libbacsql$(DEFAULT_ARCHIVE_TYPE) $(DESTDIR)$(libdir)
+
+libtool-uninstall:
+	$(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacsql.la
+
+install: @LIBTOOL_INSTALL_TARGET@ @INCLUDE_INSTALL_TARGET@
 	$(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
@@ -111,25 +141,25 @@ install:
 	$(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(scriptdir)/drop_bacula_database
 
 	@filename=make_catalog_backup; \
-	   if  test -f ${DESTDIR}${scriptdir}/$$filename; then \
+	   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
+	   echo "$(INSTALL_SCRIPT) $$filename $(DESTDIR)$(scriptdir)/$$destname"; \
+	   $(INSTALL_SCRIPT) $$filename $(DESTDIR)$(scriptdir)/$$destname
 	@filename=delete_catalog_backup; \
-	   if  test -f ${DESTDIR}${scriptdir}/$$filename; then \
+	   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
+	   echo "$(INSTALL_SCRIPT) $$filename $(DESTDIR)$(scriptdir)/$$destname"; \
+	   $(INSTALL_SCRIPT) $$filename $(DESTDIR)$(scriptdir)/$$destname
 
-uninstall:
+uninstall: @LIBTOOL_UNINSTALL_TARGET@ @INCLUDE_UNINSTALL_TARGET@
 	(cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_TYPE@_database)
 	(cd $(DESTDIR)$(scriptdir); $(RMF) update_@DB_TYPE@_tables)
 	(cd $(DESTDIR)$(scriptdir); $(RMF) make_@DB_TYPE@_tables)
@@ -147,9 +177,8 @@ uninstall:
 	(cd $(DESTDIR)$(scriptdir); $(RMF) make_catalog_backup)
 	(cd $(DESTDIR)$(scriptdir); $(RMF) delete_catalog_backup)
 
-
 # Semi-automatic generation of dependencies:
-# Use gcc -MM because X11 `makedepend' doesn't work on all systems
+# Use gcc -M because X11 `makedepend' doesn't work on all systems
 # and it also includes system headers.
 # `semi'-automatic since dependencies are generated at distribution time.
 
@@ -157,7 +186,9 @@ depend:
 	@$(MV) Makefile Makefile.bak
 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
 	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-	@$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
+	@for src in $(LIBSRCS); do \
+	    $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $(SQL_INC) $$src >> Makefile; \
+	done
 	@if test -f Makefile ; then \
 	    $(RMF) Makefile.bak; \
 	else \