- Makefile: resolve merge conflict.

diff --git a/Makefile b/Makefile
index abb473ba9d20f74764fd7e25a0186c3cecd9b5f3..5f40b594f23ddeab2ac02060592e17a8dccfa04e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,11 +23,22 @@ TARGETS = yosys yosys-config
 
 all: top-all
 
-CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -MD -D_YOSYS_ -fPIC
-LDFLAGS = -rdynamic
-LDLIBS = -lstdc++ -lreadline -lm -ldl -lrt
-QMAKE = qmake-qt4
-SED = sed
+CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -I${DESTDIR}/include -MD -D_YOSYS_ -fPIC -include kernel/posix_compatibility.h
+LDFLAGS = -I${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
 
 YOSYS_VER := 0.2.0+
 GIT_REV := $(shell git rev-parse --short HEAD || echo UNKOWN)
@@ -124,6 +135,13 @@ yosys-svgviewer: libs/svgviewer/*.h libs/svgviewer/*.cpp
        cd libs/svgviewer && $(QMAKE) && make
        cp libs/svgviewer/svgviewer 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 \