From ca3d5234a6922744f9ebfdb8d62504de9115a954 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Sun, 22 Jun 2008 12:31:24 +0000 Subject: [PATCH] ebl Activate tokyo dbm compilation (not linking) git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7215 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/lib/Makefile.in | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in index fa07fdd52f..d342ef7932 100644 --- a/bacula/src/lib/Makefile.in +++ b/bacula/src/lib/Makefile.in @@ -62,10 +62,19 @@ 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/tcadb.h tokyocabinet/tcbdb.h tokyocabinet/tchdb.h . + @touch tokyocabinet/libtokyocabinet.a + @cp tokyocabinet/libtokyocabinet.a . + + libbac.a: $(LIBOBJS) @echo "Making $@ ..." $(AR) rc $@ $(LIBOBJS) @@ -121,6 +130,8 @@ 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 -- 2.39.5