* Tue May 06 2008 Caius Chance <cchance@redhat.com>

- Refined clean target.

1 files changed, 14 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 4f1079a..3a579e1 100644
--- a/Makefile
+++ b/Makefile
@@ -5,18 +5,23 @@ SRCDIRS = $(shell find -type d | grep -v .git)
 BINDIRS = $(shell find -type d | grep -v .git | grep -v src)
 SRCFILES = $(shell find -type f | grep -v .git)
 SFDFILES = $(shell ls ./src/*.sfd)
-TTFFILES = $(shell ls ./build/*.ttf)
+TTFFILES = $(shell ls ./build/ttf/*.ttf)
 BINDOCS = AUTHORS ChangeLog COPYING License.txt README 
 
 all: dist
 
 
-build-ttf:
+ttf:
 	$(foreach sfdfile, $(SFDFILES), $(FONTFORGE) -script ./scripts/sfd2ttf.pe $(sfdfile);)
-	mkdir -p build && mv ./src/*.ttf ./build/
+	mkdir -p build/ttf && mv ./src/*.ttf ./build/ttf/
 
 
-dist: clean build-ttf
+sfd:
+	$(foreach ttffile, $(TTFFILES), $(FONTFORGE) -script ./scripts/ttf2sfd.pe $(ttffile);)
+	mkdir -p build/sfd && mv ./build/ttf/*.sfd ./build/sfd/
+
+
+dist: clean-build ttf
 	mkdir -p ../liberation-fonts_build/liberation-fonts
 	cp $(TTFFILES) $(BINDOCS) ../liberation-fonts_build/liberation-fonts/
 	mkdir -p ../liberation-fonts_tar
@@ -24,7 +29,7 @@ dist: clean build-ttf
 	  ../liberation-fonts_tar/liberation-fonts-$(VER).tar.gz \
 	  liberation-fonts/
 
-src: clean
+src: clean-build
 	mkdir -p ../liberation-fonts_build/liberation-fonts
 	$(foreach tardir, $(SRCDIRS), mkdir -p ../liberation-fonts_build/liberation-fonts/$(tardir);)
 	$(foreach srcfile, $(SRCFILES), cp $(srcfile) ../liberation-fonts_build/liberation-fonts/$(shell dirname $(srcfile))/;)
@@ -34,7 +39,9 @@ src: clean
 	  liberation-fonts/
 
 
-clean:
+clean: clean-build
+	rm -rf ../liberation-fonts_tar
+
+clean-build:
 	rm -rf build
 	rm -rf ../liberation-fonts_build
-	rm -rf ../liberation-fonts_tar