Index: trunk/Ohana/src/libtap/Makefile
===================================================================
--- trunk/Ohana/src/libtap/Makefile	(revision 10305)
+++ trunk/Ohana/src/libtap/Makefile	(revision 10312)
@@ -1,52 +1,25 @@
-default: libtap
-install: libtap
+default: install
 help:
-	@echo "make options: libtap (default)"
+	@echo "make options: install libtap clean dist"
 
 include ../../Configure
-
 HOME 	=	$(ROOT)/src/libtap
+LIB	=	$(HOME)/lib/$(ARCH)
 LIB	=	$(HOME)/lib/$(ARCH)
 INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+include ../../Makefile.Common
 
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH)
+install: $(DESTLIB)/libtap_ohana.a $(DESTLIB)/libtap_ohana.so
+libtap: $(LIB)/libtap_ohana.$(ARCH).a $(LIB)/libtap_ohana.$(ARCH).so
 
-TAP = $(SRC)/tap.$(ARCH).o
+INCS = $(DESTINC)/tap_ohana.h
 
-libtap: $(LIB)/libtap.a
+TAP = $(SRC)/tap_ohana.$(ARCH).o
 
-$(LIB)/libtap.a: $(INC)/tap.h $(TAP)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libtap.a
-	ar rcv $(LIB)/libtap.a $(TAP)
-	$(RANLIB) $(LIB)/libtap.a
-
-$(INC)/tap.h: $(SRC)/tap.h
-	@if [ ! -d $(INC) ]; then mkdir -p $(INC); fi
-	echo $@
-	echo $^
-	rm -f $@
-	cp $^ $@
-
-clean:
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*.a"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-dist: clean
-	rm -rf lib
-	rm -rf include
-
-.SUFFIXES: .$(ARCH).o
-
-.c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $*.c -o $@
+$(TAP): $(INCS)
+$(LIB)/libtap_ohana.$(ARCH).a: $(TAP)
+$(LIB)/libtap_ohana.$(ARCH).so: $(TAP)
 
 # libtap tests are currently not compiled or run