From 56c404e6c1bf75fd959b5b57ddda6c5e539c3d5d Mon Sep 17 00:00:00 2001 From: hagen Date: Fri, 12 Dec 2014 08:10:33 +0000 Subject: [PATCH] * Makefile.linux : use idents with spaces --- Makefile.linux | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Makefile.linux b/Makefile.linux index bcac24f5..621fa8af 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -4,28 +4,30 @@ INCFLAGS = # detect proper flag for c++11 support by gcc CXXVER := $(shell $(CXX) -dumpversion) ifeq ($(shell expr match ${CXXVER} "4\.[0-9][0-9]"),4) # >= 4.10 -CXXFLAGS += -std=c++11 + CXXFLAGS += -std=c++11 else ifeq ($(shell expr match ${CXXVER} "4\.[7-9]"),3) # >= 4.7 -CXXFLAGS += -std=c++11 + CXXFLAGS += -std=c++11 else ifeq ($(shell expr match ${CXXVER} "4\.6"),3) # = 4.6 -CXXFLAGS += -std=c++0x + CXXFLAGS += -std=c++0x else ifeq ($(shell expr match $(CXX) 'clang'),5) -CXXFLAGS += -std=c++11 + CXXFLAGS += -std=c++11 else # not supported -$(error Compiler too old) + $(error Compiler too old) endif -LIBDIR := /usr/lib - USE_AESNI := yes ifeq ($(STATIC),yes) -LDLIBS += $(LIBDIR)/libcryptopp.a $(LIBDIR)/libboost_system.a -LDLIBS += $(LIBDIR)/libboost_date_time.a $(LIBDIR)/libboost_filesystem.a -LDLIBS += $(LIBDIR)/libboost_regex.a $(LIBDIR)/libboost_program_options.a -LDLIBS += -lpthread -static-libstdc++ -static-libgcc -USE_AESNI := no + LIBDIR := /usr/lib + LDLIBS = $(LIBDIR)/libcryptopp.a + LDLIBS += $(LIBDIR)/libboost_system.a + LDLIBS += $(LIBDIR)/libboost_date_time.a + LDLIBS += $(LIBDIR)/libboost_filesystem.a + LDLIBS += $(LIBDIR)/libboost_regex.a + LDLIBS += $(LIBDIR)/libboost_program_options.a + LDLIBS += -lpthread -static-libstdc++ -static-libgcc + USE_AESNI := no else -LDLIBS = -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread + LDLIBS = -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread endif FGREP = fgrep