Commit 7075d9fe authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul

Fix up Makefile and svn:ignore properties. Addresess #630.

I did:
{{{
svn merge -r3229:3230 https://svn.tokutek.com/tokudb/tokudb.558
}}}


git-svn-id: file:///svn/tokudb@3231 c7de825b-a66e-492c-adef-691d508d4ae1
parent 91376533
...@@ -36,14 +36,14 @@ foo: ...@@ -36,14 +36,14 @@ foo:
clean: clean:
for d in $(SRCDIRS); do (cd $$d; $(MAKE) -k clean); done for d in $(SRCDIRS); do (cd $$d; $(MAKE) -k clean); done
rm -rf lib/*.so lib/*.a
install: install:
./install.bash ./install.bash
# maybe we should have a coverage target in each makefile # maybe we should have a coverage target in each makefile
build-coverage: build-coverage:
for d in $(SRCDIRS); do (cd $$d; $(MAKE) -k OPTFLAGS=-O0 GCOV_FLAGS="-fprofile-arcs -ftest-coverage"); done $(MAKE) build OPTFLAGS= GCOV_FLAGS="-fprofile-arcs -ftest-coverage"
(cd utils; $(MAKE) clean; $(MAKE) coverage OPTFLAGS=-O0 GCOV_FLAGS="-fprofile-arcs -ftest-coverage")
# this is messy now since we dont have consistent make targets # this is messy now since we dont have consistent make targets
check-coverage: check-coverage-newbrt check-coverage-src-tests check-coverage-utils check-coverage-cxx-tests \ check-coverage: check-coverage-newbrt check-coverage-src-tests check-coverage-utils check-coverage-cxx-tests \
......
...@@ -11,6 +11,7 @@ LIBNAME = libtokudb_cxx ...@@ -11,6 +11,7 @@ LIBNAME = libtokudb_cxx
default: install build default: install build
build: $(LIBNAME).a build: $(LIBNAME).a
cp $< ../lib/
cd tests; $(MAKE) build cd tests; $(MAKE) build
check: check:
cd tests; $(MAKE) check cd tests; $(MAKE) check
......
...@@ -89,7 +89,7 @@ BINS = $(REGRESSION_TESTS) \ ...@@ -89,7 +89,7 @@ BINS = $(REGRESSION_TESTS) \
# This line intentially kept commented so I can have a \ on the end of the previous line # This line intentially kept commented so I can have a \ on the end of the previous line
tdb_logprint: LDFLAGS+=-lz tdb_logprint: LDFLAGS+=-lz
tdb_logprint.o: log-internal.h brttypes.h yerror.h log.h kv-pair.h tdb_logprint.o: log-internal.h brttypes.h yerror.h log.h kv-pair.h log_header.h
tdb_logprint: log_code.o memory.o log.o brt-serialize.o fifo.o gpma.o ybt.o fingerprint.o mempool.o primes.o toku_assert.o roll.o brt.o cachetable.o brt-verify.o key.o tdb_logprint: log_code.o memory.o log.o brt-serialize.o fifo.o gpma.o ybt.o fingerprint.o mempool.o primes.o toku_assert.o roll.o brt.o cachetable.o brt-verify.o key.o
tdb-recover: LDFLAGS+=-lz tdb-recover: LDFLAGS+=-lz
......
...@@ -32,6 +32,7 @@ build: ...@@ -32,6 +32,7 @@ build:
cd lock_tree;$(MAKE) build cd lock_tree;$(MAKE) build
$(MAKE) $(LIBRARY) $(LIBNAME).a $(MAKE) $(LIBRARY) $(LIBNAME).a
cd tests;$(MAKE) build cd tests;$(MAKE) build
cp $(LIBRARY) $(LIBNAME).a ../lib/
.PHONY: install .PHONY: install
install: $(LIBRARY) $(LIBNAME).a install: $(LIBRARY) $(LIBNAME).a
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment