Index: trunk/Ohana/src/elixir/Makefile
===================================================================
--- trunk/Ohana/src/elixir/Makefile	(revision 2510)
+++ trunk/Ohana/src/elixir/Makefile	(revision 10305)
@@ -5,17 +5,16 @@
 
 BIN	=	$(HOME)/bin
+LIB	=	$(HOME)/lib
 INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(LBIN)
-DESTLIB	=	$(LLIB)
-DESTINC	=	$(LINC)
-DESTMAN	=	$(LMAN)
+DESTBIN	=	$(BINDIR)
+DESTLIB	=	$(LIBDIR)
+DESTINC	=	$(INCDIR)
+DESTMAN	=	$(MANDIR)
 
 #  
-INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lFITS -lohana -lm -lsocket -lnsl
-CFLAGS	=	-o $*.$(ARCH).o $(INCS)
-CCFLAGS	=	$(INCS) $(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 ELIXIR = \
@@ -42,5 +41,5 @@
 $(BIN)/$(PROGRAM).$(ARCH): $(ELIXIR)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(ELIXIR) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
+	$(CC) $(ELIXIR) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
 
 install: $(DESTBIN)/$(PROGRAM)
@@ -58,8 +57,7 @@
 	rm -f `find . -name "#*"`
 
-.SUFFIXES: .$(ARCH).o
+.PRECIOUS: %.$(ARCH).o
+.PRECIOUS: $(BIN)/%.$(ARCH)
 
-.c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $<
-
-
+%.$(ARCH).o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@