Skip to content
This repository was archived by the owner on Nov 17, 2022. It is now read-only.

Commit 8fe7293

Browse files
committed
Makefile fixes to use LDFLAGS and add gcov recipe
1 parent fe28763 commit 8fe7293

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

Makefile

+15-5
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ OBJECTS := $(patsubst $(SRCDIR)/%,$(BUILDDIR)/%,$(SOURCES:.$(SRCEXT)=.o))
3636
TESTSOURCES := $(shell find $(TESTDIR) -type f -name "*.$(SRCEXT)")
3737
TESTOBJECTS := $(patsubst $(TESTDIR)/%,$(BUILDDIR)/$(TESTDIR)/%,$(TESTSOURCES:.$(SRCEXT)=.o))
3838
HEADERS := $(shell find $(INCDIR) -type f -name "*.h" -a -not -name "catch.h")
39-
CFLAGS := -g -Wall -pedantic -std=c++0x
40-
CXXFLAGS := $(CFLAGS)
41-
LIB :=
39+
CFLAGS := -g -Wall -pedantic -std=c1x
40+
CXXFLAGS := -g -Wall -pedantic -std=c++0x
41+
LDFLAGS :=
4242
INC := -I $(INCDIR)
4343

4444
# make
4545
$(TARGET): $(OBJECTS)
4646
@echo ""; echo "Linking..."
47-
$(CXX) $^ -o $(TARGET) $(LIB)
47+
$(CXX) $^ -o $(TARGET) $(LDFLAGS)
4848

4949
$(BUILDDIR)/%.o: $(SRCDIR)/%.$(SRCEXT)
5050
@mkdir -p $(dir $@)
@@ -56,12 +56,22 @@ test: $(TARGET) $(TESTTARGET)
5656

5757
$(TESTTARGET): $(TESTOBJECTS)
5858
@echo ""; echo "Linking..."
59-
$(CXX) $^ $(filter-out $(BUILDDIR)/orq.o,$(OBJECTS)) -o $(TESTTARGET) $(LIB)
59+
$(CXX) $^ $(filter-out $(BUILDDIR)/orq.o,$(OBJECTS)) -o $(TESTTARGET) $(LDFLAGS)
6060

6161
$(BUILDDIR)/$(TESTDIR)/%.o: $(TESTDIR)/%.$(SRCEXT)
6262
@mkdir -p $(dir $@)
6363
$(CXX) $(CXXFLAGS) $(INC) -c -o $@ $<
6464

65+
gcov:
66+
ifeq ($(CXX),g++)
67+
gcov: CXXFLAGS += -g -O0 --coverage
68+
gcov: LDFLAGS += -lgcov
69+
gcov: clean test
70+
else ifeq ($(CC),gcc)
71+
gcov: CFLAGS += -g -O0 --coverage
72+
gcov: LDFLAGS += -lgcov
73+
gcov: clean test
74+
endif
6575

6676
.PHONY: clean style astyle cpplint
6777

0 commit comments

Comments
 (0)