@@ -1,14 +1,12 @@
 CC = gcc
 PKG_CONFIG = pkg-config
 FUSE_CFLAGS = $(shell $(PKG_CONFIG) --cflags fuse)
-SQLITE3_CFLAGS = $(shell $(PKG_CONFIG) --cflags sqlite3)
-CFLAGS = -Wall $(FUSE_CFLAGS) $(SQLITE3_CFLAGS) $(TCL_CFLAGS) -DDEBUG=1
+CFLAGS = -Wall $(FUSE_CFLAGS) $(TCL_CFLAGS) -DDEBUG=1
 LDFLAGS = $(TCL_LDFLAGS)
 FUSE_LIBS = $(shell $(PKG_CONFIG) --libs fuse)
-SQLITE3_LIBS = $(shell $(PKG_CONFIG) --libs sqlite3)
-LIBS = $(FUSE_LIBS) $(SQLITE3_LIBS) $(TCL_LIBS)
+LIBS = $(FUSE_LIBS) $(TCL_LIBS)
 PREFIX = /usr/local
 prefix = $(PREFIX)
 bindir = $(prefix)/bin
 sbindir = $(prefix)/sbin
 
@@ -22,26 +20,33 @@
 TCL_CFLAGS = $(shell . $(TCLCONFIG_SH_PATH); echo "$${TCL_INCLUDE_SPEC}")
 TCL_LIBS = $(shell . $(TCLCONFIG_SH_PATH); echo "$${TCL_LIB_SPEC}")
 
 all: appfsd
 
-appfsd: appfsd.o
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o appfsd appfsd.o $(LIBS)
+appfsd: appfsd.o sha1.o
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o appfsd appfsd.o sha1.o $(LIBS)
 
 appfsd.o: appfsd.c appfsd.tcl.h
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o appfsd.o -c appfsd.c
 
-appfsd.tcl.h: appfsd.tcl sha1.tcl
-	sed '/@@SHA1\.TCL@@/ r sha1.tcl' appfsd.tcl | sed '/@@SHA1\.TCL@@/ d' | sed 's@[\\"]@\\&@g;s@^@   "@;s@$$@\\n"@' > appfsd.tcl.h.new
-	mv appfsd.tcl.h.new appfsd.tcl.h
+sha1.o: sha1.c sha1.tcl.h
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o sha1.o -c sha1.c
+
+%.tcl.h: %.tcl
+	sed 's@[\\"]@\\&@g;s@^@   "@;s@$$@\\n"@' $^ > $@.new
+	mv $@.new $@
 
-install: appfsd
+install: appfsd appfs-cache appfs-mkfs
 	if [ ! -d '$(DESTDIR)$(sbindir)' ]; then mkdir -p '$(DESTDIR)$(sbindir)'; chmod 755 '$(DESTDIR)$(sbindir)'; fi
+	if [ ! -d '$(DESTDIR)$(bindir)' ]; then mkdir -p '$(DESTDIR)$(bindir)'; chmod 755 '$(DESTDIR)$(bindir)'; fi
 	cp appfsd '$(DESTDIR)$(sbindir)/'
+	cp appfs-cache '$(DESTDIR)$(sbindir)/'
+	cp appfs-mkfs '$(DESTDIR)$(bindir)/'
 
 clean:
 	rm -f appfsd appfsd.o
 	rm -f appfsd.tcl.h
+	rm -f sha1.o sha1.tcl.h
 
 distclean: clean
 
 .PHONY: all test clean distclean install