ebl remove tokyo support

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6993 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index 3cf96fe0ffea6a10d9e57488a46d7c841798fa58..fa07fdd52fd464a087c97af15dd45eaccd43f77d 100644 (file)
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -47,6 +47,7 @@ LIBOBJS = attr.o base64.o berrno.o bsys.o bget_msg.o \
 
 EXTRAOBJS = @OBJLIST@
 
 
 EXTRAOBJS = @OBJLIST@
 

+

 .SUFFIXES:     .c .o .ch .dvi .pdf .tex .view .w .1
 .PHONY:
 .DONTCARE:
 .SUFFIXES:     .c .o .ch .dvi .pdf .tex .view .w .1
 .PHONY:
 .DONTCARE:


@@ -61,17 +62,10 @@ EXTRAOBJS = @OBJLIST@
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(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 libtokyocabinet.a
+all: Makefile libbac.a

        @echo "==== Make of lib is good ===="
        @echo " "
 
        @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/tcadb.h tokyocabinet/tcbdb.h tokyocabinet/tchdb.h .
-       @cp tokyocabinet/libtokyocabinet.a .
-

 libbac.a: $(LIBOBJS)
        @echo "Making $@ ..."
        $(AR) rc  $@ $(LIBOBJS)
 libbac.a: $(LIBOBJS)
        @echo "Making $@ ..."
        $(AR) rc  $@ $(LIBOBJS)


@@ -119,7 +113,7 @@ plugins.o: plugins.c plugins.h
        @echo "Compiling $<"
        $(NO_ECHO)$(CXX) -fPIC $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
        @echo "Compiling $<"
        $(NO_ECHO)$(CXX) -fPIC $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 

-
+        

 install:
 
 uninstall:
 install:
 
 uninstall:


@@ -127,7 +121,6 @@ uninstall:
 clean:
        $(RMF) *.a core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3
        $(RMF) rwlock_test md5sum sha1sum
 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
 
 realclean: clean
        $(RMF) tags