ebl use tokyocabinet by default instead of htable

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

diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index e8c54a17e5f5b5f2707c8e31ed3a2ecdc8d7d4f9..bb6c0b638cf6a0085ce8280cc549b49602600e14 100644 (file)
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -14,9 +14,6 @@ topdir = ../..
 # this dir relative to top dir
 thisdir = src/lib
 
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OPENSSL_INC = @OPENSSL_INC@
-
 DEBUG=@DEBUG@
 
 first_rule: all
@@ -24,33 +21,32 @@ dummy:
 
 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 \
+         bsock.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 \
+         guid_to_name.c hmac.c jcr.c lex.c alist.c dlist.c \
          md5.c message.c mem_pool.c openssl.c parse_conf.c \
-         queue.c bregex.c \
+         plugins.c queue.c bregex.c \
          res.c rwlock.c scan.c serial.c sha1.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 breg.c htable.c
 
 
 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 \
+         bsock.o bpipe.o bsnprintf.o btime.o \
+         cram-md5.o crc32.o crypto.o daemon.o edit.o fnmatch.o \
+         guid_to_name.o hmac.o jcr.o lex.o alist.o dlist.o \
          md5.o message.o mem_pool.o openssl.o parse_conf.o \
-         queue.o bregex.o \
+         plugins.o queue.o bregex.o \
          res.o rwlock.o scan.o serial.o sha1.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
+         address_conf.o pythonlib.o breg.o htable.o
 
 
 EXTRAOBJS = @OBJLIST@
 
-
 .SUFFIXES:     .c .o .ch .dvi .pdf .tex .view .w .1
 .PHONY:
 .DONTCARE:
@@ -58,17 +54,24 @@ EXTRAOBJS = @OBJLIST@
 # inference rules
 .c.o:
        @echo "Compiling $<"
-       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 .cc.o:
        @echo "Compiling $<"
-       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 #-------------------------------------------------------------------------
-all: Makefile libbac.a
+all: Makefile libbac.a libtokyocabinet.a
        @echo "==== Make of lib is good ===="
        @echo " "
 
+libtokyocabinet.a:
+       @(cd tokyocabinet ; echo "==>Entering directory `pwd`"; \
+             $(MAKE) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
+                           echo ""; echo "";));
+       @cp tokyocabinet/t*.h .
+       @cp tokyocabinet/libtokyocabinet.a .
+
 libbac.a: $(LIBOBJS)
        @echo "Making $@ ..."
        $(AR) rc  $@ $(LIBOBJS)
@@ -81,7 +84,7 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 
 pythonlib.o: pythonlib.c
        @echo "Compiling $<"
-       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(python) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(python) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 rwlock_test:
        rm -f rwlock.o
@@ -111,8 +114,12 @@ bsnprintf: bsnprintf.o
        $(CXX) $(LDFLAGS) -L. -o $@ bsnprintf.o $(LIBS) $(DLIB) -lbac $(OPENSSL_LIBS) -lm
        rm -f bsnprintf.o
        $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) bsnprintf.c
-       
-        
+
+plugins.o: plugins.c plugins.h
+       @echo "Compiling $<"
+       $(NO_ECHO)$(CXX) -fPIC $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+
+
 install:
 
 uninstall:
@@ -120,6 +127,7 @@ uninstall:
 clean:
        $(RMF) *.a core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3
        $(RMF) rwlock_test md5sum sha1sum
+       (cd tokyocabinet ; make clean)
 
 realclean: clean
        $(RMF) tags