- Makefile: export PATH=${DESTDIR}/bin:$(PATH) and (DY)LD_LIBRARY_PATH, to make sure our local copies of built executables and libraries are used.

- Makefile: use find expression in target 'yosys-svgviewer' to find svgviewer binary (qmake will build into .app package on OSX).
 - Makefile: make 'test' target dependent on $(TARGETS) and $(EXTRA_TARGETS) to make sure that minisat is built.
This commit is contained in:
Siesh1oo 2014-03-10 20:06:46 +01:00
parent 59d68e1582
commit 4958559456
1 changed files with 6 additions and 2 deletions

View File

@ -27,13 +27,17 @@ CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -I${DESTDIR}/include -MD -D_YOSY
LDFLAGS = -I${DESTDIR}/lib LDFLAGS = -I${DESTDIR}/lib
LDLIBS = -lstdc++ -lreadline -lm -ldl LDLIBS = -lstdc++ -lreadline -lm -ldl
export PATH := ${DESTDIR}/bin:$(PATH)
ifeq (Darwin,$(findstring Darwin,$(shell uname))) ifeq (Darwin,$(findstring Darwin,$(shell uname)))
# add macports include and library path to search directories, don't use '-rdynamic' and '-lrt': # add macports include and library path to search directories, don't use '-rdynamic' and '-lrt':
export DYLD_LIBRARY_PATH := ${DESTDIR}/lib:$(DYLD_LIBRARY_PATH)
CXXFLAGS += -I/opt/local/include CXXFLAGS += -I/opt/local/include
LDFLAGS += -L/opt/local/lib LDFLAGS += -L/opt/local/lib
QMAKE = qmake QMAKE = qmake
SED = gsed SED = gsed
else else
export LD_LIBRARY_PATH := ${DESTDIR}/lib:$(LD_LIBRARY_PATH)
LDFLAGS += -rdynamic LDFLAGS += -rdynamic
LDLIBS += -lrt LDLIBS += -lrt
QMAKE = qmake-qt4 QMAKE = qmake-qt4
@ -133,7 +137,7 @@ yosys-config: yosys-config.in
yosys-svgviewer: libs/svgviewer/*.h libs/svgviewer/*.cpp yosys-svgviewer: libs/svgviewer/*.h libs/svgviewer/*.cpp
cd libs/svgviewer && $(QMAKE) && make cd libs/svgviewer && $(QMAKE) && make
cp libs/svgviewer/svgviewer yosys-svgviewer cp `find libs/svgviewer -name svgviewer -type f` yosys-svgviewer
yosys-minisat: $(DESTDIR)/bin/minisat yosys-minisat: $(DESTDIR)/bin/minisat
$(DESTDIR)/bin/minisat: $(DESTDIR)/bin/minisat:
@ -163,7 +167,7 @@ endif
yosys-abc: abc/abc-$(ABCREV) yosys-abc: abc/abc-$(ABCREV)
cp abc/abc-$(ABCREV) yosys-abc cp abc/abc-$(ABCREV) yosys-abc
test: yosys test: $(TARGETS) $(EXTRA_TARGETS)
cd tests/simple && bash run-test.sh cd tests/simple && bash run-test.sh
cd tests/hana && bash run-test.sh cd tests/hana && bash run-test.sh
cd tests/asicworld && bash run-test.sh cd tests/asicworld && bash run-test.sh