Index: trunk/Ohana/src/libkapa/Makefile
===================================================================
--- trunk/Ohana/src/libkapa/Makefile	(revision 10305)
+++ trunk/Ohana/src/libkapa/Makefile	(revision 10315)
@@ -1,4 +1,7 @@
+default: install
+help:
+	@echo "make options: install libkapa clean dist"
+
 include ../../Configure
-
 HOME 	=	$(ROOT)/src/libkapa
 LIB	= 	$(HOME)/lib
@@ -6,16 +9,10 @@
 MAN	=	$(HOME)/doc
 INC	=	$(HOME)/include
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+include ../../Makefile.Common
 
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
+CFLAGS	:=	$(CFLAGS) -fPIC
 
-default: install
-
-install: $(DESTINC)/kapa.h $(DESTLIB)/libkapa.a
-
-libkapa: $(LIB)/libkapa.$(ARCH).a
+install: $(DESTINC)/kapa.h $(DESTLIB)/libkapa.a $(DESTLIB)/libkapa.so
+libkapa: $(LIB)/libkapa.$(ARCH).a $(LIB)/libkapa.$(ARCH).so
 
 INCS = $(DESTINC)/kapa.h
@@ -41,40 +38,4 @@
 $(DRAW): $(INCS)
 
-$(DESTLIB)/libkapa.a: $(LIB)/libkapa.$(ARCH).a
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	rm -f $(DESTLIB)/libkapa.a
-	cp $(LIB)/libkapa.$(ARCH).a $(DESTLIB)/libkapa.a
-
 $(LIB)/libkapa.$(ARCH).a: $(OBJS) $(DRAW)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libkapa.$(ARCH).a
-	ar rcv $(LIB)/libkapa.$(ARCH).a $(OBJS) $(DRAW)
-	$(RANLIB) $(LIB)/libkapa.$(ARCH).a
-
-$(DESTLIB)/libkapa.so: $(LIB)/libkapa.$(ARCH).so
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	rm -f $(DESTLIB)/libkapa.so
-	cp $(LIB)/libkapa.$(ARCH).so $(DESTLIB)/libkapa.so
-
-$(LIB)/libkapa.$(ARCH).so: $(OBJS)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libkapa.$(ARCH).so
-	gcc -shared -Wl,-soname,libkapa.so -o $(LIB)/libkapa.$(ARCH).so $(OBJS) -lc
-
-$(DESTINC)/%: $(INC)/%
-	@if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
-	rm -f $(DESTINC)/$*
-	cp $(INC)/$* $(DESTINC)/
-
-clean:
-	rm -f */*~
-	rm -f */#*
-	rm -f */*.o
-	rm -f */*.a
-
-dist: clean
-
-.SUFFIXES: .$(ARCH).o
-
-.c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $*.c -o $@
+$(LIB)/libkapa.$(ARCH).so: $(OBJS) $(DRAW)