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 fa07fdd52fd464a087c97af15dd45eaccd43f77d..bb6c0b638cf6a0085ce8280cc549b49602600e14 100644 (file)
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -47,7 +47,6 @@ LIBOBJS = attr.o base64.o berrno.o bsys.o bget_msg.o \
 
 EXTRAOBJS = @OBJLIST@
 
-
 .SUFFIXES:     .c .o .ch .dvi .pdf .tex .view .w .1
 .PHONY:
 .DONTCARE:
@@ -62,10 +61,17 @@ EXTRAOBJS = @OBJLIST@
        $(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)
@@ -113,7 +119,7 @@ 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:
@@ -121,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