Index: /trunk/Ohana/Configure.in
===================================================================
--- /trunk/Ohana/Configure.in	(revision 10297)
+++ /trunk/Ohana/Configure.in	(revision 10298)
@@ -3,6 +3,6 @@
 # this is the location of the package
 # change this to match your location of the source
-ROOT    = ROOTDIR
-ARCH    = ARCHVAL
+ROOT    = @ROOTDIR@
+ARCH    = @ARCHVAL@
 
 # destination directories:
@@ -12,20 +12,16 @@
 # LBIN	= PREFIX/bin/$(ARCH)
 
-LBIN	= BINDIR
-LINC	= INCDIR
-LLIB	= LIBDIR
-LMAN	= MANDIR
-LHLP	= HELPDIR
-
-# X include and lib directories
-# put your X paths here if they are not automatically included (they
-# seem to be ok on most linux distributions)
-XINC    = XINCDIR
-XLIB    = XLIBDIR
-TLIB    = TLIBFLAG
+BINDIR	= @BINDIR@
+INCDIR	= @INCDIR@
+LIBDIR	= @LIBDIR@
+MANDIR	= @MANDIR@
+HELPDIR	= @HELPDIR@
 
 # prefered C compiler
 # CC = gcc -g -DOHANA_MEMORY -Wall -Werror
-CC   = gcc OPTFLAGS
+CC = gcc @OPTFLAGS@
+INCDIRS = @INCDIRS@
+LIBDIRS = @LIBDIRS@
+LIBFLAGS = @LIBFLAGS@
 
 # select the appropriate version of ranlib
Index: /trunk/Ohana/Makefile
===================================================================
--- /trunk/Ohana/Makefile	(revision 10297)
+++ /trunk/Ohana/Makefile	(revision 10298)
@@ -69,8 +69,8 @@
 
 # Required libraries depends on the architecture
-LIBS-linux = libtap libohana libfits libdvo libkapa libdummy
-LIBS-lin64 = libtap libohana libfits libdvo libkapa libdummy
-LIBS-linrh = libtap libohana libfits libdvo libkapa libdummy
-LIBS-sid   = libtap libohana libfits libdvo libkapa libdummy
+LIBS-linux = libtap libohana libfits libdvo libkapa
+LIBS-lin64 = libtap libohana libfits libdvo libkapa
+LIBS-linrh = libtap libohana libfits libdvo libkapa
+LIBS-sid   = libtap libohana libfits libdvo libkapa
 LIBS-sol   = libtap libohana libfits libdvo libkapa 
 
@@ -79,6 +79,6 @@
 	@if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
 	@if [ "$(LIBS-$(ARCH))" = "" ]; then echo; echo " *** LIBS-$(ARCH) is missing"; echo; exit 1; fi
-	mkdir -p $(LINC)
-	mkdir -p $(LLIB)
+	mkdir -p $(INCDIR)
+	mkdir -p $(LIBDIR)
 	for i in $(LIBS-$(ARCH)); do make $$i.install || exit; done
 
Index: /trunk/Ohana/configure
===================================================================
--- /trunk/Ohana/configure	(revision 10297)
+++ /trunk/Ohana/configure	(revision 10298)
@@ -76,7 +76,9 @@
 if ($#args != 1) goto usage
 
-# sun (at least) seems to need the socket library 
-# linux does not
-set archlib = ""
+set needlibs = "png z jpeg readline X11 pthread m"
+set syslibpath = "/usr/lib /usr/X11R6/lib /usr/openwin/lib"
+
+set needincs = "math.h fcntl.h malloc.h errno.h time.h memory.h stdlib.h string.h X11/X.h"
+set sysincpath = "/usr/include /usr/X11R6/include /usr/openwin/include"
 
 # check the hardware architecture:
@@ -93,6 +95,6 @@
      set arch="sun4";
    endif
-   # XXX old solaris needed termcap for readline
-   set archlib = "libsocket libnsl"
+   # sun (at least) seems to need the socket library (linux does not)
+   set needlibs = "$needlibs libsocket libnsl"
    breaksw;
  case Linux:
@@ -118,6 +120,11 @@
 set root = `pwd`
 if ($prefix == "") set prefix = $root
-set inc = $prefix/include/$arch
-set lib = $prefix/lib/$arch
+if ($vararch) then
+  set inc = $prefix/include/$arch
+  set lib = $prefix/lib/$arch
+else
+  set inc = $prefix/include
+  set lib = $prefix/lib
+endif
 if ($?LD_LIBRARY_PATH) then 
   set libpath = `echo $LD_LIBRARY_PATH | tr ':' ' '`
@@ -127,103 +134,91 @@
 
 # check for basic libraries
-set fail = 0
-foreach f ( libpng libz libjpeg libreadline $archlib )
-    foreach g ( /usr/lib $lib $libpath )
-	set name = "$g/$f.a"
-	if (-e $name) then
-	    echo "found $name"
-	    goto next_lib;
-	endif
-	set name = "$g/$f.so"
-	if (-e $name) then
-	    echo "found $name"
-	    goto next_lib;
-	endif
+set faillibs = ""
+set libflags = ""
+set libdirs  = ""
+foreach f ( $needlibs )
+    foreach g ( $syslibpath $lib $libpath )
+	set name = "$g/lib$f.a"
+	if (-e $name) goto got_lib;
+	set name = "$g/lib$f.so"
+	if (-e $name) goto got_lib;
     end
-    echo "missing $f"
-    set fail = 1
-next_lib:
+    echo "missing lib$f"
+    set faillibs = "$faillibs lib$f"
     continue
+got_lib:
+    echo "found lib$f ($name)"
+    echo "$libdirs" | grep -- "-L$g " > /dev/null
+    if ($status) then
+      set libdirs  = "$libdirs -L$g "
+    endif
+    echo "$libflags" | grep -- "-l$f " > /dev/null
+    if ($status) then
+      set libflags = "$libflags -l$f "
+    endif
 end
 
+# we need a curses library; can choose one of the following:
 # check for termcap, curses, etc
-set tlibflag = ""
 foreach f ( ncurses curses termcap )
-      foreach g ( /usr/lib $lib $libpath )
+    foreach g ( $syslibpath $lib $libpath )
 	set name = "$g/lib$f.a"
-	if (-e $name) then
-	    echo "found $name"
-	    set tlibflag = "-l$f"
-	    goto got_curses;
-	endif
+	if (-e $name) goto got_curses;
 	set name = "$g/lib$f.so"
-	if (-e $name) then
-	    echo "found $name"
-	    set tlibflag = "-l$f"
-	    goto got_curses;
-	endif
+	if (-e $name) goto got_curses;
     end
 end
-if ("$tlibflag" == "") then
-  echo "missing a valid curses library"
-  set fail = 1
-endif
+set faillibs = "$faillibs (ncurses | curses | termcap)"
+echo "missing a valid curses library"
+echo "missing: $faillibs"
+echo "please find them and install them in $lib"
+exit 1
 
 got_curses:
-
-if ($fail) then
+  echo "found $f ($name)"
+  echo "$libdirs" | grep -- "-L$g " > /dev/null
+  if ($status) then
+    set libdirs  = "$libdirs -L$g "
+  endif
+  echo "$libflags" | grep -- "-l$f " > /dev/null
+  if ($status) then
+    set libflags = "$libflags -l$f "
+  endif
+
+if ("$faillibs" != "") then
   echo "your installation is missing some important libraries"
+  echo "missing: $faillibs"
   echo "please find them and install them in $lib"
   exit 1
 endif    
 
-# check for basic libraries
-set fail = 0
-foreach f ( libX11.a )
-    foreach g ( /usr/lib $lib $libpath /usr/X11R6/lib /usr/openwin/lib )
-	set name = "$g/$f"
-	if (-e $name) then 
-	    echo "found $g/$f"
-	    set xlib = $g
-	    goto next_xlib;
-	endif
-    end
-    echo "missing $f"
-    set fail = 1
-next_xlib:
-    continue
+# check for headers
+set failincs = ""
+set incdirs = ""
+foreach f ( $needincs )
+  foreach g ( $sysincpath $inc )
+    set name = "$g/$f"
+    if (-e $name) goto got_inc;
+  end
+  echo "missing $f"
+  set failincs = "$failincs $f"
+  continue
+got_inc:
+  echo "found $f ($name)"
+  echo "$incdirs" | grep -- "-I$g " > /dev/null
+  if ($status) then
+    set incdirs = "$incdirs -I$g "
+  endif
 end
 
-if ($fail) then
-  echo "your installation is missing some important libraries"
-  echo "please find them and install them in $lib"
+if ("$failincs" != "") then
+  echo "your installation is missing some important library headers"
+  echo "please find them and install them in $inc"
   exit 1
 endif    
 
-# check for X11 headers
-set fail = 0
-foreach f ( X11/X.h )
-    foreach g ( /usr/include $inc /usr/X11R6/include /usr/openwin/include )
-	set name = "$g/$f"
-	if (-e $name) then 
-	    echo "found $g/$f"
-	    set xinc = $g
-	    goto next_xinc;
-	endif
-    end
-    echo "missing $f"
-    set fail = 1
-next_xinc:
-    continue
-end
-
-if ($fail) then
-  echo "your installation is missing some important libraries"
-  echo "please find them and install them in $lib"
-  exit 1
-endif    
-
-echo XINC: $xinc
-echo XLIB: $xlib
+echo INCDIRS: $incdirs
+echo LIBDIRS: $libdirs
+echo LIBFLAGS: $libflags
 
 echo ARCH: $arch
@@ -245,9 +240,9 @@
 # modify the BINDIR
 if ("$bindir" == "") then
-  set subdir = bin/$arch
+  set subdir = bin
   if ($vararch) set subdir = 'bin/$(ARCH)'
   set bindir = $prefix/$subdir
 endif
-cat Configure.in.tmp | sed "s| BINDIR| $bindir|" > Configure.tmp
+cat Configure.in.tmp | sed "s|@BINDIR@| $bindir|" > Configure.tmp
 rm -f Configure.in.tmp
 mv Configure.tmp Configure.in.tmp
@@ -256,9 +251,9 @@
 # modify the INCDIR
 if ("$incdir" == "") then
-  set subdir = include/$arch
+  set subdir = include
   if ($vararch) set subdir = 'include/$(ARCH)'
   set incdir = $prefix/$subdir
 endif
-cat Configure.in.tmp | sed "s| INCDIR| $incdir|" > Configure.tmp
+cat Configure.in.tmp | sed "s|@INCDIR@|$incdir|" > Configure.tmp
 rm -f Configure.in.tmp
 mv Configure.tmp Configure.in.tmp
@@ -267,9 +262,9 @@
 # modify the LIBDIR
 if ("$libdir" == "") then
-  set subdir = lib/$arch
+  set subdir = lib
   if ($vararch) set subdir = 'lib/$(ARCH)'
   set libdir = $prefix/$subdir
 endif
-cat Configure.in.tmp | sed "s| LIBDIR| $libdir|" > Configure.tmp
+cat Configure.in.tmp | sed "s|@LIBDIR@|$libdir|" > Configure.tmp
 rm -f Configure.in.tmp
 mv Configure.tmp Configure.in.tmp
@@ -280,5 +275,5 @@
   set mandir = $prefix/man
 endif
-cat Configure.in.tmp | sed "s| MANDIR| $mandir|" > Configure.tmp
+cat Configure.in.tmp | sed "s|@MANDIR@|$mandir|" > Configure.tmp
 rm -f Configure.in.tmp
 mv Configure.tmp Configure.in.tmp
@@ -290,5 +285,5 @@
 endif
 set helpdir = $datadir/help
-cat Configure.in.tmp | sed "s| HELPDIR| $helpdir|" > Configure.tmp
+cat Configure.in.tmp | sed "s|@HELPDIR@|$helpdir|" > Configure.tmp
 rm -f Configure.in.tmp
 mv Configure.tmp Configure.in.tmp
@@ -298,10 +293,10 @@
   cat Configure.in.tmp | sed "s|^\s*ARCH|# ARCH|" > Configure.tmp
 else 
-  cat Configure.in.tmp | sed "s|ARCHVAL|$arch|" > Configure.tmp
+  cat Configure.in.tmp | sed "s|@ARCHVAL@|$arch|" > Configure.tmp
 endif 
 rm -f Configure.in.tmp
 mv Configure.tmp Configure.in.tmp
 
-cat Configure.in.tmp | sed "s|ROOTDIR|$root|" | sed "s|XINCDIR|$xinc|" | sed "s|XLIBDIR|$xlib|" | sed "s|TLIBFLAG|$tlibflag|" | sed "s|OPTFLAGS|$optflags $pedantic|" > Configure
+cat Configure.in.tmp | sed "s|@ROOTDIR@|$root|" | sed "s|@INCDIRS@|$incdirs|" | sed "s|@LIBDIRS@|$libdirs|" | sed "s|@LIBFLAGS@|$libflags|" | sed "s|@OPTFLAGS@|$optflags $pedantic|" > Configure
 rm -f Configure.in.tmp Configure.tmp
 
Index: /trunk/Ohana/src/libautocode/Makefile
===================================================================
--- /trunk/Ohana/src/libautocode/Makefile	(revision 10297)
+++ /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 10297)
+++ /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 10297)
+++ /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 10297)
+++ /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 10297)
+++ /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 10297)
+++ /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