Index: trunk/Ohana/src/libautocode/Makefile
===================================================================
--- trunk/Ohana/src/libautocode/Makefile	(revision 10073)
+++ trunk/Ohana/src/libautocode/Makefile	(revision 10298)
@@ -13,12 +13,9 @@
 TEX	=	$(HOME)/tex
 MAN	= 	$(HOME)/doc
-DESTLIB	=	$(LLIB)
-DESTINC	=	$(LINC)
-DESTMAN	=	$(LMAN)
+DESTLIB	=	$(LIBDIR)
+DESTINC	=	$(INCDIR)
+DESTMAN	=	$(MANDIR)
 
-INCS	=	-I$(INC) -I$(LINC)
-LIBS	= 	-L$(LLIB)
-CFLAGS	=	$(INCS) -D$(ARCH)
-LFLAGS	=	$(LIBS)
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
 
 # remember to add entries here to libohana/Makefile:AOBJ as well
@@ -102,10 +99,10 @@
 latex: $(LIBTEX)
 
-install: $(DESTINC)/autocode.h $(DESTLIB)/libautocode.a
+install: $(DESTINC)/autocode.h $(DESTLIB)/libautocode.a $(DESTLIB)/libautocode.so
 	@echo done install
 
 test: $(DESTINC)/autocode.h
 
-autocode: $(INC)/autocode.h $(LIB)/libautocode.$(ARCH).a 
+autocode: $(INC)/autocode.h $(LIB)/libautocode.$(ARCH).a $(LIB)/libautocode.$(ARCH).so
 	@echo done autocode
 
@@ -137,4 +134,14 @@
 	@echo installed libautocode.a
 
+$(DESTLIB)/libautocode.so: $(LIB)/libautocode.$(ARCH).so
+	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
+	rm -f $(DESTLIB)/libautocode.so
+	cp $(LIB)/libautocode.$(ARCH).so $(DESTLIB)/libautocode.so
+
+$(LIB)/libautocode.$(ARCH).so: $(OBJS)
+	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
+	rm -f $(LIB)/libautocode.$(ARCH).so
+	gcc -shared -Wl,-soname,libautocode.so -o $(LIB)/libautocode.$(ARCH).so $(OBJS) -lc
+
 $(TEX)/%.tex: $(DEF)/%.d $(DEF)/autocode.tex
 	@if [ ! -d $(TEX) ]; then mkdir -p $(TEX); fi
Index: trunk/Ohana/src/libdvo/Makefile
===================================================================
--- trunk/Ohana/src/libdvo/Makefile	(revision 10073)
+++ trunk/Ohana/src/libdvo/Makefile	(revision 10298)
@@ -9,16 +9,16 @@
 MAN	=	$(HOME)/doc
 INC	=	$(HOME)/include
-DESTBIN	=	$(LBIN)
-DESTLIB	=	$(LLIB)
-DESTINC	=	$(LINC)
-DESTMAN	=	$(LMAN)
+DESTBIN	=	$(BINDIR)
+DESTLIB	=	$(LIBDIR)
+DESTINC	=	$(INCDIR)
+DESTMAN	=	$(MANDIR)
 
-CFLAGS	=	-I$(LINC) -D$(ARCH)
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
 
 default: install
 
-install: $(DESTLIB)/libdvo.a
+install: $(DESTLIB)/libdvo.a $(DESTLIB)/libdvo.so
 
-libdvo: $(LIB)/libdvo.$(ARCH).a 
+libdvo: $(LIB)/libdvo.$(ARCH).a $(LIB)/libdvo.$(ARCH).so
 
 INCS = $(DESTINC)/dvo.h $(DESTINC)/autocode.h
@@ -102,4 +102,14 @@
 	$(RANLIB) $(LIB)/libdvo.$(ARCH).a
 
+$(DESTLIB)/libdvo.so: $(LIB)/libdvo.$(ARCH).so
+	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
+	rm -f $(DESTLIB)/libdvo.so
+	cp $(LIB)/libdvo.$(ARCH).so $(DESTLIB)/libdvo.so
+
+$(LIB)/libdvo.$(ARCH).so: $(OBJS)
+	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
+	rm -f $(LIB)/libdvo.$(ARCH).so
+	gcc -shared -Wl,-soname,libdvo.so -o $(LIB)/libdvo.$(ARCH).so $(OBJS) -lc
+
 $(DESTINC)/%: $(INC)/%
 	@if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
Index: trunk/Ohana/src/libfits/Makefile
===================================================================
--- trunk/Ohana/src/libfits/Makefile	(revision 10073)
+++ trunk/Ohana/src/libfits/Makefile	(revision 10298)
@@ -1,4 +1,2 @@
-# libfits package version $Name: not supported by cvs2svn $
-
 include ../../Configure
 
@@ -10,15 +8,15 @@
 INC	=	$(HOME)/include
 MAN	= 	$(HOME)/doc
-DESTLIB	=	$(LLIB)
-DESTINC	=	$(LINC)
-DESTMAN	=	$(LMAN)
+DESTLIB	=	$(LIBDIR)
+DESTINC	=	$(INCDIR)
+DESTMAN	=	$(MANDIR)
 
-CFLAGS	=	-I$(LINC) -D$(ARCH)
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
 
 default: install
 
-install: $(DESTLIB)/libFITS.a $(DESTMAN)/fits.1
+install: $(DESTLIB)/libFITS.a $(DESTLIB)/libFITS.so $(DESTMAN)/fits.1
 
-libfits: $(LIB)/libFITS.$(ARCH).a
+libfits: $(LIB)/libFITS.$(ARCH).a $(LIB)/libFITS.$(ARCH).so
 
 INCS = $(DESTINC)/gfitsio.h 
@@ -71,4 +69,14 @@
 	$(RANLIB) $(LIB)/libFITS.$(ARCH).a
 
+$(DESTLIB)/libFITS.so: $(LIB)/libFITS.$(ARCH).so
+	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
+	rm -f $(DESTLIB)/libFITS.so
+	cp $(LIB)/libFITS.$(ARCH).so $(DESTLIB)/libFITS.so
+
+$(LIB)/libFITS.$(ARCH).so: $(OBJS)
+	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
+	rm -f $(LIB)/libFITS.$(ARCH).so
+	gcc -shared -Wl,-soname,libFITS.so -o $(LIB)/libFITS.$(ARCH).so $(OBJS) -lc
+
 $(DESTINC)/%: $(INC)/%
 	@if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
Index: trunk/Ohana/src/libkapa/Makefile
===================================================================
--- trunk/Ohana/src/libkapa/Makefile	(revision 10073)
+++ trunk/Ohana/src/libkapa/Makefile	(revision 10298)
@@ -6,16 +6,16 @@
 MAN	=	$(HOME)/doc
 INC	=	$(HOME)/include
-DESTBIN	=	$(LBIN)
-DESTLIB	=	$(LLIB)
-DESTINC	=	$(LINC)
-DESTMAN	=	$(LMAN)
+DESTBIN	=	$(BINDIR)
+DESTLIB	=	$(LIBDIR)
+DESTINC	=	$(INCDIR)
+DESTMAN	=	$(MANDIR)
 
-CFLAGS	= -I$(LINC) -I$(INC) -D$(ARCH)
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
 
 default: install
 
-install: $(DESTINC)/kapa.h $(DESTLIB)/libkapa.a
+install: $(DESTINC)/kapa.h $(DESTLIB)/libkapa.a $(DESTLIB)/libkapa.so
 
-libkapa: $(LIB)/libkapa.$(ARCH).a 
+libkapa: $(LIB)/libkapa.$(ARCH).a $(LIB)/libkapa.$(ARCH).so
 
 INCS = $(DESTINC)/kapa.h
@@ -52,4 +52,14 @@
 	$(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
Index: trunk/Ohana/src/libohana/Makefile
===================================================================
--- trunk/Ohana/src/libohana/Makefile	(revision 10073)
+++ trunk/Ohana/src/libohana/Makefile	(revision 10298)
@@ -9,18 +9,18 @@
 TESTLIB =       $(ROOT)/src/libtap/lib/$(ARCH)
 TESTINC =       $(ROOT)/src/libtap/include
-DESTBIN	=	$(LBIN)
-DESTLIB	=	$(LLIB)
-DESTINC	=	$(LINC)
-DESTMAN	=	$(LMAN)
+DESTBIN	=	$(BINDIR)
+DESTLIB	=	$(LIBDIR)
+DESTINC	=	$(INCDIR)
+DESTMAN	=	$(MANDIR)
 
-LIBS	= 	-L$(LLIB) -L$(XLIB) -lohana
-CFLAGS	=	-I$(INC) -I$(LINC) -D$(ARCH)
+CFLAGS	=	-I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
 TFLAGS  =       $(CFLAGS) $(LIBS) -L$(TESTLIB) -I$(TESTINC) -ltap
+LIBS	= 	-L$(LIBDIRS) $(LIBFLAGS) -lohana
 
 default: install
 
-install: $(DESTLIB)/libohana.a
+install: $(DESTLIB)/libohana.a $(DESTLIB)/libohana.so
 
-libohana: $(LIB)/libohana.$(ARCH).a 
+libohana: $(LIB)/libohana.$(ARCH).a $(LIB)/libohana.$(ARCH).so 
 
 INCS = \
@@ -58,4 +58,14 @@
 	$(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
@@ -83,8 +93,4 @@
 
 .c.$(ARCH).o:
-	echo make c
-	echo $(CFLAGS)
-	echo $*.c
-	echo $@
 	$(CC) $(CFLAGS) -c $*.c -o $@
 
Index: trunk/Ohana/src/libtap/Makefile
===================================================================
--- trunk/Ohana/src/libtap/Makefile	(revision 10073)
+++ trunk/Ohana/src/libtap/Makefile	(revision 10298)
@@ -16,9 +16,5 @@
 DESTMAN	=	$(LMAN)
 
-#  
-INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -L$(XLIB) -ldvo -lkapa -lFITS -lohana -lz -lm
-CFLAGS	=	$(INCS)
-LFLAGS	=	$(LIBS)
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH)
 
 TAP = $(SRC)/tap.$(ARCH).o