diff options
| author | Siesh1oo <siesh1oo@siesh1oo.no> | 2014-03-12 14:16:55 +0100 |
|---|---|---|
| committer | Siesh1oo <siesh1oo@siesh1oo.no> | 2014-03-12 14:16:55 +0100 |
| commit | a8efb61e1f5221bdb013d90e83530392f61c13f8 (patch) | |
| tree | 3340450586629c4e88b85c3543d923a9fcc28f9c | |
| parent | 18367919ea64a0881da7cf439c99365a8807d3a3 (diff) | |
| download | yosys-a8efb61e1f5221bdb013d90e83530392f61c13f8.tar.gz yosys-a8efb61e1f5221bdb013d90e83530392f61c13f8.tar.bz2 yosys-a8efb61e1f5221bdb013d90e83530392f61c13f8.zip | |
- Makefile: follow changes in https://github.com/cliffordwolf/yosys
| -rw-r--r-- | Makefile | 19 |
1 files changed, 3 insertions, 16 deletions
@@ -56,8 +56,6 @@ OBJS = kernel/version_$(GIT_REV).o ABCREV = 2058c8ccea68 ABCPULL = 1 -MINISATREV = HEAD - -include Makefile.conf ifeq ($(CONFIG),clang-debug) @@ -87,8 +85,8 @@ CXXFLAGS += -pg -fno-inline LDFLAGS += -pg endif -ifeq ($(ENABLE_MINISAT),1) -TARGETS += yosys-minisat +ifeq ($(ENABLE_QT4),1) +TARGETS += yosys-svgviewer endif ifeq ($(ENABLE_ABC),1) @@ -102,13 +100,9 @@ CXXFLAGS += $(patsubst %,-I$(VERIFIC_DIR)/%,$(VERIFIC_COMPONENTS)) -D'VERIFIC_DI LDLIBS += $(patsubst %,$(VERIFIC_DIR)/%/*-linux.a,$(VERIFIC_COMPONENTS)) endif -# Build yosys after minisat and abc (we need to access the local copies of the downloaded/installed header files). +# Build yosys after abc (we need to access the the downloaded/installed header files and libraries when building yosys). TARGETS += yosys yosys-config -ifeq ($(ENABLE_QT4),1) -TARGETS += yosys-svgviewer -endif - OBJS += kernel/driver.o kernel/register.o kernel/rtlil.o kernel/log.o kernel/calc.o kernel/posix_compatibility.o OBJS += libs/bigint/BigIntegerAlgorithms.o libs/bigint/BigInteger.o libs/bigint/BigIntegerUtils.o @@ -147,13 +141,6 @@ yosys-svgviewer: libs/svgviewer/*.h libs/svgviewer/*.cpp cd libs/svgviewer && $(QMAKE) && make cp `find libs/svgviewer -name svgviewer -type f` yosys-svgviewer -yosys-minisat: $(DESTDIR)/bin/minisat -$(DESTDIR)/bin/minisat: - test -d minisat || ( git clone https://github.com/niklasso/minisat.git minisat && $(SED) -i -e 's/PRIi64/ & /' minisat/minisat/utils/Options.h ) - ( cd minisat && git checkout $(MINISATREV) ) - ( cd minisat && $(MAKE) prefix=$(DESTDIR) DESTDIR="" config install ) - @( cd minisat && echo "Installed minisat version `git describe --always --dirty` into $(DESTDIR)." ) - abc/abc-$(ABCREV): ifneq ($(ABCREV),default) if ( cd abc && hg identify; ) | grep -q +; then \ |