From 0fa02066b9a5611e9d88f28d4ca81ab01510d8fc Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 23 Nov 2015 13:08:13 -0500 Subject: [PATCH] Remove --symbol-inline and directly generate dist/img/maki-sprite.svg --- Makefile | 10 +++------- svg/maki-sprite.src.svg | 1 - 2 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 svg/maki-sprite.src.svg diff --git a/Makefile b/Makefile index dabf0639b..614de95e7 100644 --- a/Makefile +++ b/Makefile @@ -10,19 +10,15 @@ all: \ MAKI_SOURCES = node_modules/maki/src/*.svg -MAKI_SPRITE = svg/maki-sprite.src.svg $(MAKI_SOURCES): node_modules/.install -$(MAKI_SPRITE): $(MAKI_SOURCES) Makefile - svg-sprite --symbol --symbol-inline --symbol-dest . --symbol-sprite $(MAKI_SPRITE) $(MAKI_SOURCES) +dist/img/maki-sprite.svg: $(MAKI_SOURCES) Makefile + svg-sprite --symbol --symbol-dest . --symbol-sprite $@ $(MAKI_SOURCES) data/feature-icons.json: $(MAKI_SOURCES) cp -f node_modules/maki/www/maki-sprite.json $@ -dist/img/maki-sprite.svg: $(MAKI_SPRITE) $(MAKI_SOURCES) - node svg/spriteify.js --svg $(MAKI_SPRITE) > $@ - dist/img/iD-sprite.svg: svg/iD-sprite.src.svg svg/iD-sprite.json node svg/spriteify.js --svg svg/iD-sprite.src.svg --json svg/iD-sprite.json > $@ @@ -114,7 +110,7 @@ node_modules/.install: package.json npm install && touch node_modules/.install clean: - rm -f $(BUILDJS_TARGETS) $(MAKI_SPRITE) data/feature-icons.json dist/iD*.js dist/iD.css dist/img/*.svg + rm -f $(BUILDJS_TARGETS) data/feature-icons.json dist/iD*.js dist/iD.css dist/img/*.svg translations: node data/update_locales diff --git a/svg/maki-sprite.src.svg b/svg/maki-sprite.src.svg deleted file mode 100644 index aaad158c5..000000000 --- a/svg/maki-sprite.src.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file