Commit 2cb9fb2e authored by Yoni Fogel's avatar Yoni Fogel

Port to OSX for makefiles, easier to use OSX versions.

git-svn-id: file:///svn/tokudb@2229 c7de825b-a66e-492c-adef-691d508d4ae1
parent 6880c167
...@@ -7,7 +7,7 @@ CPPFLAGS = -I../ -I../../include ...@@ -7,7 +7,7 @@ CPPFLAGS = -I../ -I../../include
CXXFLAGS = -Wall $(OPTFLAGS) -g $(GCOV_FLAGS) CXXFLAGS = -Wall $(OPTFLAGS) -g $(GCOV_FLAGS)
LDLIBS = ../../lib/libtdb_cxx.a ../../lib/libdb.a -lz LDLIBS = ../../lib/libtdb_cxx.a ../../lib/libdb.a -lz
ifeq ($(OSX),OSX) ifneq ($(OSX),)
VGRIND= VGRIND=
else else
VGRIND=valgrind --quiet --error-exitcode=1 --leak-check=yes VGRIND=valgrind --quiet --error-exitcode=1 --leak-check=yes
......
...@@ -10,7 +10,7 @@ CPPFLAGS = -I../include -I../newbrt -I./lock_tree/ -I./range_tree/ ...@@ -10,7 +10,7 @@ CPPFLAGS = -I../include -I../newbrt -I./lock_tree/ -I./range_tree/
CPPFLAGS += -D_GNU_SOURCE -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CPPFLAGS += -D_GNU_SOURCE -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
ifeq ($(OSX),OSX) ifneq ($(OSX),)
LIBEXT=dylib LIBEXT=dylib
SHARED=-dynamiclib SHARED=-dynamiclib
CFLAGS+=-fno-common CFLAGS+=-fno-common
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# For very verbose output do # For very verbose output do
# make VERBOSE=2 # make VERBOSE=2
ifeq ($(OSX),OSX) ifneq ($(OSX),)
#Note: OSX 10.4 needs DYLD_LIBRARY_PATH. OSX 10.5 claims to support -rpath. #Note: OSX 10.4 needs DYLD_LIBRARY_PATH. OSX 10.5 claims to support -rpath.
LIBEXT=dylib LIBEXT=dylib
VGRIND= VGRIND=
......
...@@ -11,7 +11,7 @@ BDB_CPPFLAGS = -I$(BDBDIR)/include ...@@ -11,7 +11,7 @@ BDB_CPPFLAGS = -I$(BDBDIR)/include
BDB_LDFLAGS = -L$(BDBDIR)/lib -ldb BDB_LDFLAGS = -L$(BDBDIR)/lib -ldb
endif endif
ifeq ($(OSX),OSX) ifneq ($(OSX),)
#Note: OSX 10.4 needs DYLD_LIBRARY_PATH. OSX 10.5 claims to support -rpath. #Note: OSX 10.4 needs DYLD_LIBRARY_PATH. OSX 10.5 claims to support -rpath.
CFLAGS = -DOSX CFLAGS = -DOSX
LIBEXT=dylib LIBEXT=dylib
......
...@@ -14,7 +14,7 @@ CFLAGS = -std=gnu89 -W -Wall -Wno-unused -g $(OPTFLAGS) $(GCOV_FLAGS) ...@@ -14,7 +14,7 @@ CFLAGS = -std=gnu89 -W -Wall -Wno-unused -g $(OPTFLAGS) $(GCOV_FLAGS)
# to the current directory # to the current directory
CPPFLAGS = -I../include CPPFLAGS = -I../include
ifeq ($(OSX),OSX) ifneq ($(OSX),)
#Note: OSX 10.4 needs DYLD_LIBRARY_PATH. OSX 10.5 claims to support -rpath. #Note: OSX 10.4 needs DYLD_LIBRARY_PATH. OSX 10.5 claims to support -rpath.
TDB_LOADLIBES = TDB_LOADLIBES =
BDB_LOADLIBES = BDB_LOADLIBES =
......
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