Commit b6af3c7a authored by Giacomo Fiorin's avatar Giacomo Fiorin
Browse files

Conventional make tweaks to handle Lepton C++11 requirement

parent b6a6638f
Loading
Loading
Loading
Loading
+12 −8
Original line number Diff line number Diff line
@@ -52,25 +52,29 @@ LEPTON_SRCS = \
	lepton/src/ParsedExpression.cpp lepton/src/ExpressionProgram.cpp    \
	lepton/src/Operation.cpp lepton/src/Parser.cpp

LEPTON_OBJS = \
	lepton/src/CompiledExpression.o lepton/src/ExpressionTreeNode.o \
	lepton/src/ParsedExpression.o lepton/src/ExpressionProgram.o    \
	lepton/src/Operation.o lepton/src/Parser.o

COLVARS_OBJS = $(COLVARS_SRCS:.cpp=.o) $(LEPTON_OBJS)
# Allow to selectively turn off Lepton
ifeq ($(ENABLE_LEPTON),no)
LEPTON_INCFLAGS = 
COLVARS_OBJS = $(COLVARS_SRCS:.cpp=.o)
else
LEPTON_INCFLAGS = -Ilepton/include -DLEPTON
COLVARS_OBJS = $(COLVARS_SRCS:.cpp=.o) $(LEPTON_SRCS:.cpp=.o)
endif


%.o: %.cpp
	$(CXX) $(CXXFLAGS) $(COLVARS_INCFLAGS) -Ilepton/include -DLEPTON -c -o $@ $<
	$(CXX) $(CXXFLAGS) $(COLVARS_INCFLAGS) $(LEPTON_INCFLAGS) -c -o $@ $<

$(COLVARS_LIB):	Makefile.deps $(COLVARS_OBJS)
	$(AR) $(ARFLAGS) $(COLVARS_LIB) $(COLVARS_OBJS) $(LEPTON_OBJS)
	$(AR) $(ARFLAGS) $(COLVARS_LIB) $(COLVARS_OBJS)


Makefile.deps: $(COLVARS_SRCS)
	@echo > $@
	@for src in $^ ; do \
	  obj=`basename $$src .cpp`.o ; \
	  $(CXX) -MM $(COLVARS_INCFLAGS)  -Ilepton/include -DLEPTON \
	  $(CXX) -MM $(COLVARS_INCFLAGS)  $(LEPTON_INCFLAGS) \
	    -MT '$$(COLVARS_OBJ_DIR)'$$obj $$src >> $@ ; \
	  done

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ COLVARS_LIB = libcolvars.a
COLVARS_OBJ_DIR =

CXX =		g++
CXXFLAGS =	-O2 -g -Wall -fPIC -funroll-loops
CXXFLAGS =	-std=c++0x -O2 -g -Wall -fPIC -funroll-loops
AR =		ar
ARFLAGS =	-rscv
SHELL =		/bin/sh