From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 8 Jul 2008 12:04:12 +0000 (+0000)
Subject: ebl  remove tokyo from main Makefile
X-Git-Tag: Release-3.0.0~1174
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=423edfef40cf5695a9b63e4a2722aea90b468e3b;p=bacula%2Fbacula

ebl  remove tokyo from main Makefile


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

diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index d342ef7932..fa07fdd52f 100644
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -62,19 +62,10 @@ EXTRAOBJS = @OBJLIST@
 	$(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 " "
 
-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 .
-	@touch tokyocabinet/libtokyocabinet.a
-	@cp tokyocabinet/libtokyocabinet.a .
-
-
 libbac.a: $(LIBOBJS)
 	@echo "Making $@ ..."
 	$(AR) rc  $@ $(LIBOBJS)
@@ -130,8 +121,6 @@ uninstall:
 clean:
 	$(RMF) *.a core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3
 	$(RMF) rwlock_test md5sum sha1sum
-	$(RMF) tcadb.h tcbdb.h tchdb.h
-	(cd tokyocabinet ; make clean)
 
 realclean: clean
 	$(RMF) tags