Index: trunk/Ohana/src/libohana/Makefile
===================================================================
--- trunk/Ohana/src/libohana/Makefile	(revision 10305)
+++ trunk/Ohana/src/libohana/Makefile	(revision 10315)
@@ -1,5 +1,9 @@
+default: install
+help:
+	@echo "make options: install libohana clean dist"
+
 include ../../Configure
-
 HOME 	=	$(ROOT)/src/libohana
+BIN	= 	$(HOME)/bin
 LIB	= 	$(HOME)/lib
 SRC	=	$(HOME)/src
@@ -7,20 +11,16 @@
 INC	=	$(HOME)/include
 TESTDIR =       $(HOME)/test
-TESTLIB =       $(ROOT)/src/libtap/lib/$(ARCH)
-TESTINC =       $(ROOT)/src/libtap/include
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+include ../../Makefile.Common
 
-CFLAGS	=	-I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
-TFLAGS  =       $(CFLAGS) $(LIBS) -L$(TESTLIB) -I$(TESTINC) -ltap
-LIBS	= 	-L$(LIBDIRS) $(LIBFLAGS) -lohana
+CFLAGS	:=	$(CFLAGS) -fPIC
+LDFLAGS := 	$(LDFLAGS) -lohana
+TFLAGS  =       $(CFLAGS) $(LDFLAGS) -ltap_ohana
 
-default: install
-
-install: $(DESTLIB)/libohana.a 
-
-libohana: $(LIB)/libohana.$(ARCH).a 
+install: $(DESTLIB)/libohana.a $(DESTLIB)/libohana.so
+libohana: $(LIB)/libohana.$(ARCH).a $(LIB)/libohana.$(ARCH).so
+testcode: install $(TEST)
+test:
+	make testcode
+	for i in $(TEST); do $$i; done
 
 INCS = \
@@ -46,52 +46,10 @@
 
 $(OBJS): $(INCS)
+$(LIB)/libohana.$(ARCH).a: $(OBJS)
+$(LIB)/libohana.$(ARCH).so: $(OBJS)
 
-$(DESTLIB)/libohana.a: $(LIB)/libohana.$(ARCH).a
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	rm -f $(DESTLIB)/libohana.a
-	cp $(LIB)/libohana.$(ARCH).a $(DESTLIB)/libohana.a
-
-$(LIB)/libohana.$(ARCH).a: $(OBJS)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libohana.$(ARCH).a
-	ar rcv $(LIB)/libohana.$(ARCH).a $(OBJS)
-	$(RANLIB) $(LIB)/libohana.$(ARCH).a
-
-$(DESTLIB)/libohana.so: $(LIB)/libohana.$(ARCH).so
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	rm -f $(DESTLIB)/libohana.so
-	cp $(LIB)/libohana.$(ARCH).so $(DESTLIB)/libohana.so
-
-$(LIB)/libohana.$(ARCH).so: $(OBJS)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libohana.$(ARCH).so
-	gcc -shared -Wl,-soname,libohana.so -o $(LIB)/libohana.$(ARCH).so $(OBJS) -lc
-
-$(DESTINC)/%: $(INC)/%
-	@if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
-	rm -f $(DESTINC)/$*
-	cp $(INC)/$* $(DESTINC)/
-
-$(TESTDIR)/%.$(ARCH) : $(DESTLIB)/libohana.a $(TESTDIR)/%.c
+$(TESTDIR)/%.$(ARCH) : $(TESTDIR)/%.c
 	$(CC) $^ -o $@ $(TFLAGS)
 
-testcode: install $(TEST)
+.PHONY: test
 
-test:
-	make testcode
-	for i in $(TEST); do $$i; done
-
-clean:
-	rm -f */*~
-	rm -f */#*
-	rm -f */*.o
-	rm -f */*.a
-
-dist: clean
-
-.SUFFIXES: .$(ARCH).o
-
-.c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $*.c -o $@
-
-.PHONY: test