--- ../Makefile.in	2010-03-04 08:45:45.000000000 -0600
+++ Makefile.in	2010-03-08 15:27:50.000000000 -0600
@@ -13,16 +13,17 @@
 all: snoopy.so detect
 
-snoopy.so:  snoopy.c snoopy.h
-	$(CC) $(CFLAGS) -shared -O3 -fomit-frame-pointer -fPIC snoopy.c -osnoopy.so $(LIBS)
+snoopy.so: snoopy.c snoopy.h
+	$(CC) $(CFLAGS) -shared -O3 -fomit-frame-pointer -fPIC snoopy.c -o $@ $(LIBS)
 
 detect: detect.c
-	$(CC) detect.c -odetect $(LIBS)
+	$(CC) detect.c -o $@ $(LIBS)
 
 
+$(LIBDIR):
+	install -m 755 -d $@
 
-install: all
-	install -m 755 -d $(LIBDIR)
-	install -m 755 snoopy.so $(LIBDIR)/snoopy.so
-	@echo -e "\nSnoopy shared library installed in $(LIBDIR)."
+install: $(LIBDIR) all
+	install -m 644 snoopy.so $(LIBDIR)/snoopy.so
+	-[ -f snoopy-tagged.so ] && install -m 644 snoopy-tagged.so $(LIBDIR)/snoopy-tagged.so
 	@echo -e "Run 'make enable' to actually enable snoopy logging.\n"
 
@@ -34,6 +35,6 @@
 
 
-clean:
-	rm -f detect snoopy.so
+clean: FRC
+	rm -f detect *.so *.o
 
 distclean: clean
@@ -44,2 +45,4 @@
 realclean: distclean
 	rm -f configure configure.scan
+
+FRC: