kes Fix memory leak with storage ids in cats/sql_get.c

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

diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index 862ebf8d809273da56aacd95f14c04377b833af9..e8c54a17e5f5b5f2707c8e31ed3a2ecdc8d7d4f9 100644 (file)
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -22,28 +22,28 @@ DEBUG=@DEBUG@
 first_rule: all
 dummy:
 
-LIBSRCS = alloc.c attr.c base64.c berrno.c bsys.c bget_msg.c \
-         bnet.c bnet_server.c \
-         bpipe.c bshm.c bsnprintf.c btime.c \
-         cram-md5.c crc32.c daemon.c edit.c fnmatch.c \
+LIBSRCS = attr.c base64.c berrno.c bsys.c bget_msg.c \
+         bnet.c bnet_server.c runscript.c \
+         bpipe.c bsnprintf.c btime.c \
+         cram-md5.c crc32.c crypto.c daemon.c edit.c fnmatch.c \
          hmac.c idcache.c jcr.c lex.c alist.c dlist.c \
-         md5.c message.c mem_pool.c parse_conf.c \
-         queue.c regex.c \
+         md5.c message.c mem_pool.c openssl.c parse_conf.c \
+         queue.c bregex.c \
          res.c rwlock.c scan.c serial.c sha1.c \
-         semlock.c signal.c smartall.c tls.c tree.c \
+         signal.c smartall.c rblist.c tls.c tree.c \
          util.c var.c watchdog.c workq.c btimers.c \
-         address_conf.c pythonlib.c 
+         address_conf.c pythonlib.c
 
 
-LIBOBJS = alloc.o attr.o base64.o berrno.o bsys.o bget_msg.o \
-         bnet.o bnet_server.o \
-         bpipe.o bshm.o bsnprintf.o btime.o \
-         cram-md5.o crc32.o daemon.o edit.o fnmatch.o \
+LIBOBJS = attr.o base64.o berrno.o bsys.o bget_msg.o \
+         bnet.o bnet_server.o runscript.o \
+         bpipe.o bsnprintf.o btime.o \
+         cram-md5.o crc32.o crypto.o daemon.o edit.o enh_fnmatch.o fnmatch.o \
          hmac.o idcache.o jcr.o lex.o alist.o dlist.o \
-         md5.o message.o mem_pool.o parse_conf.o \
-         queue.o regex.o \
+         md5.o message.o mem_pool.o openssl.o parse_conf.o \
+         queue.o bregex.o \
          res.o rwlock.o scan.o serial.o sha1.o \
-         semlock.o signal.o smartall.o tls.o tree.o \
+         signal.o smartall.o rblist.o tls.o tree.o \
          util.o var.o watchdog.o workq.o btimers.o \
          address_conf.o pythonlib.o
 
@@ -57,10 +57,12 @@ EXTRAOBJS = @OBJLIST@
 
 # inference rules
 .c.o:
-       $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+       @echo "Compiling $<"
+       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 .cc.o:
-       $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+       @echo "Compiling $<"
+       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 #-------------------------------------------------------------------------
 all: Makefile libbac.a
@@ -68,6 +70,7 @@ all: Makefile libbac.a
        @echo " "
 
 libbac.a: $(LIBOBJS)
+       @echo "Making $@ ..."
        $(AR) rc  $@ $(LIBOBJS)
        $(RANLIB) $@
 
@@ -77,7 +80,8 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 pythonlib.o: pythonlib.c
-       $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(python) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+       @echo "Compiling $<"
+       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(python) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 rwlock_test:
        rm -f rwlock.o
@@ -133,12 +137,12 @@ 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) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
+       @$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -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
 
 # -----------------------------------------------------------------------