From e2a912acb92c8114e6835fe5eb55d07ee2e2d2c3 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Tue, 15 Jul 2014 12:24:06 -0700 Subject: [PATCH] Makefile.am: use custom vars instead of resetting common ones Signed-off-by: Josh Durgin --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1e7f9ae84..dccf8cbea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,13 +3,13 @@ OPT ?= -DNDEBUG ACLOCAL_AMFLAGS = -I m4 WARNING_FLAGS = -Wall -Werror -CFLAGS = -g -O2 -fPIC -CXXFLAGS = -std=c++11 -g -O2 -fPIC +ROCKSDB_CFLAGS = -g -O2 -fPIC +ROCKSDB_CXXFLAGS = -std=c++11 -g -O2 -fPIC GFLAG = gflags noinst_LTLIBRARIES = librocksdb.la -librocksdb_la_CFLAGS = $(WARNING_FLAGS) -I$(srcdir) -I$(srcdir)/include -DOS_LINUX -DROCKSDB_PLATFORM_POSIX -fno-builtin-memcmp $(OPT) -DHAVE_JEMALLOC -Woverloaded-virtual -librocksdb_la_CXXFLAGS = $(WARNING_FLAGS) -std=c++11 -I$(srcdir) -I$(srcdir)/include -DOS_LINUX -DROCKSDB_PLATFORM_POSIX -fno-builtin-memcmp $(OPT) -DHAVE_JEMALLOC -Woverloaded-virtual -DROCKSDB_ATOMIC_PRESENT -DROCKSDB_FALLOCATE_PRESENT +librocksdb_la_CFLAGS = $(WARNING_FLAGS) $(ROCKSDB_CFLAGS) -I$(srcdir) -I$(srcdir)/include -DOS_LINUX -DROCKSDB_PLATFORM_POSIX -fno-builtin-memcmp $(OPT) -DHAVE_JEMALLOC -Woverloaded-virtual +librocksdb_la_CXXFLAGS = $(WARNING_FLAGS) $(ROCKSDB_CXXFLAGS) -I$(srcdir) -I$(srcdir)/include -DOS_LINUX -DROCKSDB_PLATFORM_POSIX -fno-builtin-memcmp $(OPT) -DHAVE_JEMALLOC -Woverloaded-virtual -DROCKSDB_ATOMIC_PRESENT -DROCKSDB_FALLOCATE_PRESENT librocksdb_la_LDFLAGS = -shared -Wl,-soname -Wl if WITH_ATOMIC librocksdb_la_CFLAGS += -DROCKSDB_ATOMIC_PRESENT -- 2.47.3