From: Siesh1oo <siesh1oo@siesh1oo.no>
Date: Thu, 13 Mar 2014 10:30:50 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Siesh1oo/yosys
X-Git-Tag: yosys-0.3.0~57^2~1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bc657b58e4ce13604186a7ad6440925ae82c1e4d;p=yosys.git

Merge branch 'master' of https://github.com/Siesh1oo/yosys

Conflicts:
	Makefile
	libs/minisat/System.cc
---

bc657b58e4ce13604186a7ad6440925ae82c1e4d
diff --cc Makefile
index 035f7c5a4,b7bf4485c..73051e524
--- a/Makefile
+++ b/Makefile
@@@ -22,22 -22,22 +22,11 @@@ TARGETS = yosys yosys-confi
  
  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 -135,7 +121,7 @@@ yosys-config: yosys-config.i
  
  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)