Added yosys-svgviewer to build system and renamed filterlib to yosys-filterlib

diff --git a/.gitignore b/.gitignore
index 4576d54d660fd04a5fe13c76e2db93046af091c2..191b95992e7e378661917cbb4e3edc4c857a9fad 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ qtcreator.config
 qtcreator.creator
 qtcreator.creator.user
 Makefile.conf
-filterlib
 yosys
 yosys-config
+yosys-filterlib
+yosys-svgviewer

diff --git a/Makefile b/Makefile
index b20d1771226b62793192b478e630b3ba53927b09..6d501d4fb07e65bcc65cc12501f7b2937b937732 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ OBJS += libs/sha1/sha1.o
 OBJS += libs/subcircuit/subcircuit.o
 
 GENFILES =
-TARGETS = yosys yosys-config
+TARGETS = yosys yosys-config yosys-svgviewer
 
 all: top-all
 
@@ -51,6 +51,10 @@ yosys-config: yosys-config.in
        sed 's,@CXX@,$(CXX),; s,@CXXFLAGS@,$(CXXFLAGS),; s,@LDFLAGS@,$(LDFLAGS),; s,@LDLIBS@,$(LDLIBS),;' < yosys-config.in > yosys-config
        chmod +x yosys-config
 
+yosys-svgviewer: libs/svgviewer/*
+       cd libs/svgviewer && qmake && make
+       cp libs/svgviewer/svgviewer yosys-svgviewer
+
 test: yosys
        cd tests/simple && bash run-test.sh
        cd tests/hana && bash run-test.sh
@@ -59,10 +63,13 @@ test: yosys
 install: yosys
        install yosys /usr/local/bin/yosys
        install yosys-config /usr/local/bin/yosys-config
+       install yosys-svgviewer /usr/local/bin/yosys-svgviewer
+       install yosys-filterlib /usr/local/bin/yosys-filterlib
 
 clean:
        rm -f $(OBJS) $(GENFILES) $(TARGETS)
        rm -f libs/*/*.d frontends/*/*.d passes/*/*.d backends/*/*.d kernel/*.d
+       test ! -f libs/svgviewer/Makefile || make -C libs/svgviewer distclean
 
 mrproper: clean
        git clean -xdf

diff --git a/libs/svgviewer/.gitignore b/libs/svgviewer/.gitignore
new file mode 100644 (file)
index 0000000..b92d91f
--- /dev/null
+++ b/libs/svgviewer/.gitignore
@@ -0,0 +1,5 @@
+Makefile
+moc_mainwindow.cpp
+moc_svgview.cpp
+qrc_svgviewer.cpp
+svgviewer

diff --git a/passes/dfflibmap/Makefile.inc b/passes/dfflibmap/Makefile.inc
index ed92b299c406bebf0f31b77b0e2c9d86aebc1cbf..b4d73fa1270d30e2b77b89032dcaa8209bec1e0c 100644 (file)
--- a/passes/dfflibmap/Makefile.inc
+++ b/passes/dfflibmap/Makefile.inc
@@ -2,9 +2,9 @@
 OBJS += passes/dfflibmap/dfflibmap.o
 OBJS += passes/dfflibmap/libparse.o
 
-TARGETS += filterlib
+TARGETS += yosys-filterlib
 GENFILES += passes/dfflibmap/filterlib.o
 
-filterlib: passes/dfflibmap/filterlib.o
-       $(CXX) -o filterlib $(LDFLAGS) $^ $(LDLIBS)
+yosys-filterlib: passes/dfflibmap/filterlib.o
+       $(CXX) -o yosys-filterlib $(LDFLAGS) $^ $(LDLIBS)