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

This commit is contained in:
Clifford Wolf 2013-03-27 10:51:15 +01:00
parent 62b9e16f87
commit 9c401b58a2
4 changed files with 18 additions and 5 deletions

3
.gitignore vendored
View File

@ -9,6 +9,7 @@ qtcreator.config
qtcreator.creator qtcreator.creator
qtcreator.creator.user qtcreator.creator.user
Makefile.conf Makefile.conf
filterlib
yosys yosys
yosys-config yosys-config
yosys-filterlib
yosys-svgviewer

View File

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

5
libs/svgviewer/.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
Makefile
moc_mainwindow.cpp
moc_svgview.cpp
qrc_svgviewer.cpp
svgviewer

View File

@ -2,9 +2,9 @@
OBJS += passes/dfflibmap/dfflibmap.o OBJS += passes/dfflibmap/dfflibmap.o
OBJS += passes/dfflibmap/libparse.o OBJS += passes/dfflibmap/libparse.o
TARGETS += filterlib TARGETS += yosys-filterlib
GENFILES += passes/dfflibmap/filterlib.o GENFILES += passes/dfflibmap/filterlib.o
filterlib: passes/dfflibmap/filterlib.o yosys-filterlib: passes/dfflibmap/filterlib.o
$(CXX) -o filterlib $(LDFLAGS) $^ $(LDLIBS) $(CXX) -o yosys-filterlib $(LDFLAGS) $^ $(LDLIBS)