diff options
author | Ineiev <ineiev@gnu.org> | 2016-07-22 10:02:13 +0300 |
---|---|---|
committer | Ineiev <ineiev@gnu.org> | 2016-09-09 08:12:26 +0000 |
commit | 16796e01d7c233360ea08b13c0db6d74864013e8 (patch) | |
tree | 11799f7eeca44721f336b442c5b4197a4e2ca08d | |
parent | e4e36823c9ec8fae5797cd0d3a3fe794c817d2c4 (diff) | |
download | miguel-16796e01d7c233360ea08b13c0db6d74864013e8.tar.gz miguel-16796e01d7c233360ea08b13c0db6d74864013e8.tar.bz2 |
drop schematics PNG
It's hard to generate high-quality PNGs automatically.
-rw-r--r-- | configure.ac | 13 | ||||
-rw-r--r-- | hw/Makefile.am.m4 | 1 | ||||
-rw-r--r-- | hw/image.scm.in | 22 | ||||
-rw-r--r-- | hw/m4/makefile.m4 | 9 |
4 files changed, 3 insertions, 42 deletions
diff --git a/configure.ac b/configure.ac index aec2727..940bbb9 100644 --- a/configure.ac +++ b/configure.ac @@ -37,15 +37,6 @@ LIBS="$LIBS $HIDAPI_LIBS" HIDAPI-LIBUSB not found. ])]) -AC_MSG_CHECKING([for schematics output resolution]) -AC_ARG_WITH([schematics-resolution], - [AS_HELP_STRING([--with-schematics-resolution], - [schematics output resolution (actual only if the output is rebuilt) - @<:@3200x2400@:>@])],, - [with_schematics_resolution=3200x2400 -]) -AC_MSG_RESULT([$with_schematics_resolution]) - AC_CHECK_PROGS([PCB], [pcb], [no]) AS_CASE([$PCB], [no],[we_have_pcb=no @@ -94,9 +85,7 @@ AS_CASE([$with_gschem], [no],[use_gschem=no],[use_gschem=$we_have_gschem]) AM_CONDITIONAL([use_gschem],[test $use_gschem = yes]) -image_size=$(echo $with_schematics_resolution|sed "s/x/ /g") -AC_SUBST([SCHEMATICS_IMAGE_SIZE],[$image_size]) AC_CONFIG_SUBDIRS([firmware]) -AC_CONFIG_FILES([Makefile hw/Makefile hw/image.scm]) +AC_CONFIG_FILES([Makefile hw/Makefile]) AC_OUTPUT diff --git a/hw/Makefile.am.m4 b/hw/Makefile.am.m4 index 39c14b0..e32bb9f 100644 --- a/hw/Makefile.am.m4 +++ b/hw/Makefile.am.m4 @@ -38,4 +38,3 @@ $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.m4 $(srcdir)/m4/makefile.m4 schematicsdir=$(pkgdatadir)/schematics schematics_DATA= ST_SCHEMATIC(miguel) -DISTCLEANFILES=image.scm diff --git a/hw/image.scm.in b/hw/image.scm.in deleted file mode 100644 index 087e7f7..0000000 --- a/hw/image.scm.in +++ /dev/null @@ -1,22 +0,0 @@ -; miguel the keyboard controller: schematics PNG output script -; -; miguel is free design; you can redistribute it and/or modify -; it under the terms of the GNU General Public License as published by -; the Free Software Foundation; either version 3 of the License, or -; (at your option) any later version. -; -; This program is distributed in the hope that it will be useful, -; but WITHOUT ANY WARRANTY; without even the implied warranty of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -; GNU General Public License for more details. -; -; You should have received a copy of the GNU General Public License -; along with this program. If not, see <https://www.gnu.org/licenses/>. -; -; Copyright (C) 2008, 2016 Ineiev <ineiev@gnu.org>, super V 93 -(image-size @SCHEMATICS_IMAGE_SIZE@) -(image-color "enabled") -(gschem-use-rc-values) -;actually the filename is specified in the command line -(gschem-image "dummyfile") -(gschem-exit) diff --git a/hw/m4/makefile.m4 b/hw/m4/makefile.m4 index d0b97cf..b37e54d 100644 --- a/hw/m4/makefile.m4 +++ b/hw/m4/makefile.m4 @@ -66,14 +66,9 @@ endif ) define(ST_SCHEMATIC, `###schematic $1 expanded definition begins -EXTRA_DIST+=$1.sch schematics/$1.png schematics/$1.ps schematics/$1.pdf -schematics_DATA+=schematics/$1.png schematics/$1.ps schematics/$1.pdf +EXTRA_DIST+=$1.sch schematics/$1.ps schematics/$1.pdf +schematics_DATA+=schematics/$1.ps schematics/$1.pdf if use_gschem -schematics/$1.png: $1.sch - $(MKDIR_P) schematics - gschem -p -o $(abs_builddir)/schematics/$1.png\ - -s $(abs_builddir)/image.scm $(srcdir)/$1.sch 2>/dev/null - $(RM) gschem.log schematics/$1.ps: $1.sch $(MKDIR_P) schematics gschem -p -o $(abs_builddir)/schematics/$1.ps\ |