Commit 26443937 authored by Mathieu Giraud's avatar Mathieu Giraud Committed by Mikaël Salson

algo/Makefile, algo/tests/Makefile: link to lib/lib.a

parent 540882bd
......@@ -23,17 +23,17 @@ PARANOID= -Wall -Weffc++ -pedantic \
-Wunused-function -Wunused-label -Wunused-parameter \
-Wunused-value -Wunused-variable -Wvariadic-macros \
-Wvolatile-register-var -Wwrite-strings
LDFLAGS=-lm
LDFLAGS=-lm -lz
EXEC=vidjil
MAINCORE=$(wildcard *.cpp)
LIBCORE=core/vidjil.a
LIBCORE=core/vidjil.a lib/lib.a
BINDIR=..
CGIDIR=../browser/cgi
CREATE_VERSION_GIT_H := $(shell test -x ./create-git-version-h.sh && ./create-git-version-h.sh)
.PHONY: all core clean forcedep
.PHONY: all core lib clean forcedep
v: vidjil align.cgi
......@@ -80,10 +80,12 @@ debug:
$(EXEC): %: %.o
make -C core OPTIM="$(OPTIM)"
make -C lib OPTIM="$(OPTIM)"
$(CC) -o $(BINDIR)/$@ $^ $(LIBCORE) $(LDFLAGS) $(CXXFLAGS)
clean:
make -C core $@
make -C lib $@
rm -f *.o *.gcda *.gcno *.gcov cgi/*.o
cd $(BINDIR) ; rm -f $(EXEC)
make -C tests $@
......@@ -91,6 +93,7 @@ clean:
forcedep:
g++ -M $(MAINCORE) > dep.mk
make -C core forcedep
make -C lib forcedep
DEP=$(wildcard dep.mk)
......
CC=g++
CXXFLAGS=-W -Wall -g -O0 $(COVERAGE)
INCLUDE=-I ..
LDFLAGS=
LDFLAGS=-lz
SRC= tests.cpp
EXEC=$(SRC:.cpp=)
OTHER_SRC=$(wildcard *.cpp)
LIB=../core/vidjil.a
LIB=../core/vidjil.a ../lib/lib.a
SHOULD=$(wildcard *.should_get)
SHOULD_LOG=$(SHOULD:.should_get=.log)
......
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