From a3fa05bff986d13a96285e2c523b03d4cf8ed374 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 8 Aug 2020 10:26:39 -0500 Subject: [PATCH] Don't use :: rules, they inhibit parallelism(?) --- Makefile | 2 +- _lib/rules.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 1eed1c3..6a1a81c 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ ECHO=@true VECHO=true endif -default:: +default: clean: $(ECHO) CLEAN diff --git a/_lib/rules.py b/_lib/rules.py index 7be7e92..f03d0da 100755 --- a/_lib/rules.py +++ b/_lib/rules.py @@ -16,7 +16,7 @@ MAKE_SCAD_STL = """ \t$(Q)openscad -o {target}.tmp.stl -d {target}.d $(SCAD_FLAGS) {flags} {src} \t$(Q)admesh -b {target} {target}.tmp.stl \t$(Q)rm -f {target}.tmp.stl -default:: {target} +default: {target} """ MAKE_SCAD_SVG = """ @@ -25,7 +25,7 @@ MAKE_SCAD_SVG = """ \t$(ECHO) $target \t$(Q)mkdir -p $(dir {target}) \t$(Q)openscad -o {target} -d {target}.d $(SCAD_FLAGS) {flags} {src} -default:: {target} +default: {target} """ MAKE_SCAD_PNG = """ @@ -33,10 +33,10 @@ MAKE_SCAD_PNG = """ {target}: {src} \t$(ECHO) $target \t$(Q)mkdir -p $(dir {target}) -\t$(Q)openscad --imgsize=2048,2048 -o {target}.tmp.png -d {target}.d $(SCAD_FLAGS) {flags} {src} +\t$(Q)openscad --imgsize=1800,1800 -o {target}.tmp.png -d {target}.d $(SCAD_FLAGS) {flags} {src} \t$(Q)convert -geometry 25% {target}.tmp.png {target} \t$(Q)rm -f {target}.tmp.png -default:: {target} +default: {target} """ MAKE_STL_PNG = """ @@ -44,10 +44,10 @@ MAKE_STL_PNG = """ {target}: {src} \t$(ECHO) $target \t$(Q)mkdir -p $(dir {target}) -\t$(Q)openscad --imgsize=2048,2048 -o {target}.tmp.png -d {target}.d $(SCAD_FLAGS) {flags} -Dinput=\\\"{src}\\\" _lib/readfile.scad +\t$(Q)openscad --imgsize=1800,1800 -o {target}.tmp.png -d {target}.d $(SCAD_FLAGS) {flags} -Dinput=\\\"{src}\\\" _lib/readfile.scad \t$(Q)convert -geometry 25% {target}.tmp.png {target} \t$(Q)rm -f {target}.tmp.png -default:: {target} +default: {target} """ with open(sys.argv[1]) as f: