summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Makefile30
2 files changed, 7 insertions, 24 deletions
diff --git a/.gitignore b/.gitignore
index 69d56bfa..10491a3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
/qtcreator.creator.user
/libs/svgviewer/svgviewer.app
/Makefile.conf
+/minisat
/abc
/yosys
/yosys-abc
diff --git a/Makefile b/Makefile
index 035f7c5a..73051e52 100644
--- a/Makefile
+++ b/Makefile
@@ -22,22 +22,11 @@ TARGETS = yosys yosys-config
all: top-all
-CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -I${DESTDIR}/include -MD -D_YOSYS_ -fPIC -include kernel/posix_compatibility.h
-LDFLAGS = -L${DESTDIR}/lib
-LDLIBS = -lstdc++ -lreadline -lm -ldl
-
-ifeq (Darwin,$(findstring Darwin,$(shell uname)))
- # add macports include and library path to search directories, don't use '-rdynamic' and '-lrt':
- CXXFLAGS += -I/opt/local/include
- LDFLAGS += -L/opt/local/lib
- QMAKE = qmake
- SED = gsed
-else
- LDFLAGS += -rdynamic
- LDLIBS += -lrt
- QMAKE = qmake-qt4
- SED = sed
-endif
+CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -MD -D_YOSYS_ -fPIC
+LDFLAGS = -rdynamic
+LDLIBS = -lstdc++ -lreadline -lm -ldl -lrt
+QMAKE = qmake-qt4
+SED = sed
YOSYS_VER := 0.2.0+
GIT_REV := $(shell git rev-parse --short HEAD || echo UNKOWN)
@@ -132,14 +121,7 @@ yosys-config: yosys-config.in
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)." )
+ cp libs/svgviewer/svgviewer yosys-svgviewer
abc/abc-$(ABCREV):
ifneq ($(ABCREV),default)