Index: /trunk/Ohana/src/addstar/Makefile
===================================================================
--- /trunk/Ohana/src/addstar/Makefile	(revision 10304)
+++ /trunk/Ohana/src/addstar/Makefile	(revision 10305)
@@ -7,17 +7,16 @@
 HOME 	=	$(ROOT)/src/addstar
 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) -L$(XLIB) -ldvo -lkapa -lFITS -lohana -lz -lm
-CFLAGS	=	$(INCS)
-LFLAGS	=	$(LIBS)
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 ADDSTAR = \
Index: /trunk/Ohana/src/delstar/Makefile
===================================================================
--- /trunk/Ohana/src/delstar/Makefile	(revision 10304)
+++ /trunk/Ohana/src/delstar/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)
-LIBS	= 	-L$(LLIB) -ldvo -lFITS -lohana -lm 
-CFLAGS	=	$(INCS)
-LFLAGS	=	$(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 DELSTAR = \
Index: /trunk/Ohana/src/elixir/Makefile
===================================================================
--- /trunk/Ohana/src/elixir/Makefile	(revision 10304)
+++ /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 $@
Index: /trunk/Ohana/src/fixcat/Makefile
===================================================================
--- /trunk/Ohana/src/fixcat/Makefile	(revision 10304)
+++ /trunk/Ohana/src/fixcat/Makefile	(revision 10305)
@@ -6,17 +6,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 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS)
-CCFLAGS	=	$(INCS) $(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 FIXCAT = \
@@ -58,6 +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 $@
Index: /trunk/Ohana/src/gastro/Makefile
===================================================================
--- /trunk/Ohana/src/gastro/Makefile	(revision 10304)
+++ /trunk/Ohana/src/gastro/Makefile	(revision 10305)
@@ -7,17 +7,16 @@
 HOME 	=	$(ROOT)/src/gastro
 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) -ldvo -lFITS -lohana -lm -lsocket -lnsl 
-CFLAGS	=	$(INCS)
-LFLAGS	=	$(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 # -----------------------
Index: /trunk/Ohana/src/gastro2/Makefile
===================================================================
--- /trunk/Ohana/src/gastro2/Makefile	(revision 10304)
+++ /trunk/Ohana/src/gastro2/Makefile	(revision 10305)
@@ -4,17 +4,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) -ldvo -lFITS -lohana -lsocket -lnsl -lm 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS)
-CCFLAGS	=	$(INCS) $(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 2MASS = \
@@ -67,5 +66,5 @@
 
 coordtest: $(COORDTEST)
-	$(CC) $(COORDTEST) -o $(BIN)/coordtest.linux $(CCFLAGS)
+	$(CC) $(COORDTEST) -o $(BIN)/coordtest.linux $(LFLAGS)
 
 # dependancy rules for binary code ##########################
@@ -74,5 +73,5 @@
 $(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
+	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
 
 install: $(DESTBIN)/$(PROGRAM)
@@ -90,8 +89,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 $@
Index: /trunk/Ohana/src/gcompare/Makefile
===================================================================
--- /trunk/Ohana/src/gcompare/Makefile	(revision 10304)
+++ /trunk/Ohana/src/gcompare/Makefile	(revision 10305)
@@ -4,17 +4,15 @@
 
 BIN	=	$(HOME)/bin
+LIB	=	$(HOME)/lib
 MAN	=	$(HOME)/doc
 SRC	=	$(HOME)/src
 INC	=	$(HOME)/include
-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 
-CFLAGS	=	$(INCS) 
-CCFLAGS	=	$(INCS) $(LIBS) 
-LFLAGS	=	$(LIBS)
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -lFITS -lohana $(LIBFLAGS) 
 
 INSTALL = gcompare
@@ -67,3 +65,2 @@
 	rm -f $(DESTMAN)/gcompare.1
 	cp $(MAN)/gcompare.1 $(DESTMAN)/
-
Index: /trunk/Ohana/src/getstar/Makefile
===================================================================
--- /trunk/Ohana/src/getstar/Makefile	(revision 10304)
+++ /trunk/Ohana/src/getstar/Makefile	(revision 10305)
@@ -4,17 +4,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) -ldvo -lFITS -lohana -lm 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS)
-CCFLAGS	=	$(INCS) $(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 GETSTAR = \
@@ -37,5 +36,5 @@
 $(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
+	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
 
 install: $(DESTBIN)/$(PROGRAM)
@@ -53,8 +52,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 $@
Index: /trunk/Ohana/src/gophot/Makefile
===================================================================
--- /trunk/Ohana/src/gophot/Makefile	(revision 10304)
+++ /trunk/Ohana/src/gophot/Makefile	(revision 10305)
@@ -7,17 +7,16 @@
 HOME    =       $(ROOT)/src/gophot
 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)
-LIBS	= 	-L$(LLIB) -lFITS -lohana -lm 
-CFLAGS	=	$(INCS)
-LFLAGS	=	$(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 OBJ = \
Index: /trunk/Ohana/src/imclean/Makefile
===================================================================
--- /trunk/Ohana/src/imclean/Makefile	(revision 10304)
+++ /trunk/Ohana/src/imclean/Makefile	(revision 10305)
@@ -4,17 +4,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) -ldvo -lFITS -lohana -lm 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS)
-CCFLAGS	=	$(INCS) $(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 OBJ = \
@@ -34,5 +33,5 @@
 $(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
+	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
 
 install: $(DESTBIN)/$(PROGRAM)
@@ -52,8 +51,7 @@
 	rm -f $(BIN)/*.$(ARCH)
 
-.SUFFIXES: .$(ARCH).o
+.PRECIOUS: %.$(ARCH).o
+.PRECIOUS: $(BIN)/%.$(ARCH)
 
-.c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $<
-
-
+%.$(ARCH).o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
Index: /trunk/Ohana/src/imregister/Makefile
===================================================================
--- /trunk/Ohana/src/imregister/Makefile	(revision 10304)
+++ /trunk/Ohana/src/imregister/Makefile	(revision 10305)
@@ -5,11 +5,12 @@
 
 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)
 
 BASEDIR =	$(HOME)/base
@@ -20,8 +21,6 @@
 SPREG   =	$(HOME)/spreg
 
-INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -ldvo -lFITS -lohana -lm 
-CFLAGS	=	$(INCS)
-LFLAGS	=	$(LIBS)
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 # programs which should be installed
Index: /trunk/Ohana/src/kapa/Makefile
===================================================================
--- /trunk/Ohana/src/kapa/Makefile	(revision 10304)
+++ /trunk/Ohana/src/kapa/Makefile	(revision 10305)
@@ -5,6 +5,8 @@
 default: $(PROGRAM)
 
+LIB	=	$(HOME)/lib
 INC	=	$(HOME)/include
 BIN	=	$(HOME)/bin
+LIB	=	$(HOME)/lib
 BDIR	=	$(HOME)/button
 CDIR	=	$(HOME)/colorbar
@@ -16,13 +18,11 @@
 SDIR	=	$(HOME)/setup
 ZDIR	=	$(HOME)/zoom
-DESTBIN	=	$(LBIN)
-DESTLIB	=	$(LLIB)
-DESTINC	=	$(LINC)
-DESTMAN	=	$(LMAN)
+DESTBIN	=	$(BINDIR)
+DESTLIB	=	$(LIBDIR)
+DESTINC	=	$(INCDIR)
+DESTMAN	=	$(MANDIR)
 #
-INCS	= 	-I$(LINC) -I$(XINC) -I$(INC) 
-LIBS	= 	-L$(LLIB) -L$(XLIB)
-CFLAGS  =	$(INCS) 
-LFLAGS	=	$(LIBS) -lFITS -lkapa -lohana -lX11 -lsocket -lnsl -lpng -lz -lm
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -lkapa -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 # local source / object files ########################
Index: /trunk/Ohana/src/kii/Makefile
===================================================================
--- /trunk/Ohana/src/kii/Makefile	(revision 10304)
+++ /trunk/Ohana/src/kii/Makefile	(revision 10305)
@@ -6,4 +6,5 @@
 
 INC	=	$(HOME)/include
+LIB	=	$(HOME)/lib
 BIN	=	$(HOME)/bin
 BDIR	=	$(HOME)/button
@@ -15,13 +16,11 @@
 SDIR	=	$(HOME)/setup
 ZDIR	=	$(HOME)/zoom
-DESTBIN	=	$(LBIN)
-DESTLIB	=	$(LLIB)
-DESTINC	=	$(LINC)
-DESTMAN	=	$(LMAN)
+DESTBIN	=	$(BINDIR)
+DESTLIB	=	$(LIBDIR)
+DESTINC	=	$(INCDIR)
+DESTMAN	=	$(MANDIR)
 #
-INCS	= 	-I$(LINC) -I$(XINC) -I$(INC) 
-LIBS	= 	-L$(LLIB) -L$(XLIB)
-CFLAGS  =	$(INCS) 
-LFLAGS	=	$(LIBS) -ldvo -lFITS -lkapa -lohana -ljpeg -lX11 -lsocket -lnsl -lm
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lkapa -lohana $(LIBFLAGS) 
 
 # local source / object files ########################
Index: /trunk/Ohana/src/libautocode/Makefile
===================================================================
--- /trunk/Ohana/src/libautocode/Makefile	(revision 10304)
+++ /trunk/Ohana/src/libautocode/Makefile	(revision 10305)
@@ -99,10 +99,10 @@
 latex: $(LIBTEX)
 
-install: $(DESTINC)/autocode.h $(DESTLIB)/libautocode.a $(DESTLIB)/libautocode.so
+install: $(DESTINC)/autocode.h $(DESTLIB)/libautocode.a
 	@echo done install
 
 test: $(DESTINC)/autocode.h
 
-autocode: $(INC)/autocode.h $(LIB)/libautocode.$(ARCH).a $(LIB)/libautocode.$(ARCH).so
+autocode: $(INC)/autocode.h $(LIB)/libautocode.$(ARCH).a
 	@echo done autocode
 
Index: /trunk/Ohana/src/libdummy/Makefile
===================================================================
--- /trunk/Ohana/src/libdummy/Makefile	(revision 10304)
+++ /trunk/Ohana/src/libdummy/Makefile	(revision 10305)
@@ -6,5 +6,5 @@
 include ../../Configure
 
-DESTLIB	=	$(LLIB)
+DESTLIB	=	$(LIBDIR)
 
 default: libdummy
Index: /trunk/Ohana/src/libdvo/Makefile
===================================================================
--- /trunk/Ohana/src/libdvo/Makefile	(revision 10304)
+++ /trunk/Ohana/src/libdvo/Makefile	(revision 10305)
@@ -18,7 +18,7 @@
 default: install
 
-install: $(DESTLIB)/libdvo.a $(DESTLIB)/libdvo.so
+install: $(DESTLIB)/libdvo.a
 
-libdvo: $(LIB)/libdvo.$(ARCH).a $(LIB)/libdvo.$(ARCH).so
+libdvo: $(LIB)/libdvo.$(ARCH).a
 
 INCS = $(DESTINC)/dvo.h $(DESTINC)/autocode.h
@@ -118,5 +118,5 @@
 
 tabletest: install
-	gcc -L$(LLIB) -I$(LINC) -o tabletest $(SRC)/tabletest.c -ldvo -lFITS -lohana -lm
+	gcc -L$(LIBDIR) -I$(INCDIR) -o tabletest $(SRC)/tabletest.c -ldvo -lFITS -lohana -lm
 
 clean:
Index: /trunk/Ohana/src/libfits/Makefile
===================================================================
--- /trunk/Ohana/src/libfits/Makefile	(revision 10304)
+++ /trunk/Ohana/src/libfits/Makefile	(revision 10305)
@@ -16,7 +16,7 @@
 default: install
 
-install: $(DESTLIB)/libFITS.a $(DESTLIB)/libFITS.so $(DESTMAN)/fits.1
+install: $(DESTLIB)/libFITS.a $(DESTMAN)/fits.1
 
-libfits: $(LIB)/libFITS.$(ARCH).a $(LIB)/libFITS.$(ARCH).so
+libfits: $(LIB)/libFITS.$(ARCH).a
 
 INCS = $(DESTINC)/gfitsio.h 
Index: /trunk/Ohana/src/libkapa/Makefile
===================================================================
--- /trunk/Ohana/src/libkapa/Makefile	(revision 10304)
+++ /trunk/Ohana/src/libkapa/Makefile	(revision 10305)
@@ -15,7 +15,7 @@
 default: install
 
-install: $(DESTINC)/kapa.h $(DESTLIB)/libkapa.a $(DESTLIB)/libkapa.so
+install: $(DESTINC)/kapa.h $(DESTLIB)/libkapa.a
 
-libkapa: $(LIB)/libkapa.$(ARCH).a $(LIB)/libkapa.$(ARCH).so
+libkapa: $(LIB)/libkapa.$(ARCH).a
 
 INCS = $(DESTINC)/kapa.h
Index: /trunk/Ohana/src/libohana/Makefile
===================================================================
--- /trunk/Ohana/src/libohana/Makefile	(revision 10304)
+++ /trunk/Ohana/src/libohana/Makefile	(revision 10305)
@@ -20,7 +20,7 @@
 default: install
 
-install: $(DESTLIB)/libohana.a $(DESTLIB)/libohana.so
+install: $(DESTLIB)/libohana.a 
 
-libohana: $(LIB)/libohana.$(ARCH).a $(LIB)/libohana.$(ARCH).so 
+libohana: $(LIB)/libohana.$(ARCH).a 
 
 INCS = \
Index: /trunk/Ohana/src/libtap/Makefile
===================================================================
--- /trunk/Ohana/src/libtap/Makefile	(revision 10304)
+++ /trunk/Ohana/src/libtap/Makefile	(revision 10305)
@@ -11,8 +11,8 @@
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(LBIN)
-DESTLIB	=	$(LLIB)
-DESTINC	=	$(LINC)
-DESTMAN	=	$(LMAN)
+DESTBIN	=	$(BINDIR)
+DESTLIB	=	$(LIBDIR)
+DESTINC	=	$(INCDIR)
+DESTMAN	=	$(MANDIR)
 
 CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH)
Index: /trunk/Ohana/src/lightcurve/Makefile
===================================================================
--- /trunk/Ohana/src/lightcurve/Makefile	(revision 10304)
+++ /trunk/Ohana/src/lightcurve/Makefile	(revision 10305)
@@ -6,34 +6,33 @@
 
 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) -ldvo -lFITS -lohana -lm 
-CFLAGS	=	-o $*.o $(INCS) 
-CCFLAGS	=	$(INCS) $(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 OBJS = \
-$(SRC)/args.o 		$(SRC)/get_names.o \
-$(SRC)/get_stars.o 	$(SRC)/sort_stars.o \
-$(SRC)/get_unique.o 	$(SRC)/get_sources.o \
-$(SRC)/get_info.o 	$(SRC)/make_table.o \
-$(SRC)/lightcurve.o	\
-$(SRC)/sort_seq.o	\
-$(SRC)/help.o 
+$(SRC)/args.$(ARCH).o 		$(SRC)/get_names.$(ARCH).o \
+$(SRC)/get_stars.$(ARCH).o 	$(SRC)/sort_stars.$(ARCH).o \
+$(SRC)/get_unique.$(ARCH).o 	$(SRC)/get_sources.$(ARCH).o \
+$(SRC)/get_info.$(ARCH).o 	$(SRC)/make_table.$(ARCH).o \
+$(SRC)/lightcurve.$(ARCH).o	\
+$(SRC)/sort_seq.$(ARCH).o	\
+$(SRC)/help.$(ARCH).o 
 
 $(OBJS): $(INC)/lightcurve.h
 
-$(PROGRAM):	$(BIN)/$(PROGRAM)
+$(PROGRAM):	$(BIN)/$(PROGRAM).$(ARCH)
 
-$(BIN)/$(PROGRAM): $(OBJS)
+$(BIN)/$(PROGRAM).$(ARCH): $(OBJS)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJS) -o $(BIN)/$(PROGRAM) $(CCFLAGS)
+	$(CC) $(OBJS) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
 
 # -----------------------
@@ -42,5 +41,5 @@
 	rm -f $(DESTBIN)/$(PROGRAM)
 #	rm -f $(DESTMAN)/$(PROGRAM).1
-	cp $(BIN)/$(PROGRAM)   $(DESTBIN)/
+	cp $(BIN)/$(PROGRAM).$(ARCH)   $(DESTBIN)/
 #	cp $(MAN)/$(PROGRAM).1 $(DESTMAN)/
 
@@ -54,2 +53,8 @@
 	rm -f $(BIN)/$(PROGRAM)
 
+
+.PRECIOUS: %.$(ARCH).o
+.PRECIOUS: $(BIN)/%.$(ARCH)
+
+%.$(ARCH).o : %.c
+	$(CC) $(CFLAGS)-c $< -o $@
Index: /trunk/Ohana/src/markrock/Makefile
===================================================================
--- /trunk/Ohana/src/markrock/Makefile	(revision 10304)
+++ /trunk/Ohana/src/markrock/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) -ldvo -lFITS -lohana -lm 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS)
-CCFLAGS	=	$(INCS) $(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 MARKROCK = \
@@ -45,5 +44,5 @@
 $(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
+	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
 
 install: $(DESTBIN)/$(PROGRAM)
@@ -61,8 +60,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 $@
Index: /trunk/Ohana/src/markstar/Makefile
===================================================================
--- /trunk/Ohana/src/markstar/Makefile	(revision 10304)
+++ /trunk/Ohana/src/markstar/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) -ldvo -lFITS -lohana -lm 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS)
-CCFLAGS	=	$(INCS) $(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 MARKSTAR = \
@@ -45,5 +44,5 @@
 $(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
+	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
 
 install: $(DESTBIN)/$(PROGRAM)
@@ -61,8 +60,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 $@
Index: /trunk/Ohana/src/misc/Makefile
===================================================================
--- /trunk/Ohana/src/misc/Makefile	(revision 10304)
+++ /trunk/Ohana/src/misc/Makefile	(revision 10305)
@@ -4,19 +4,17 @@
 default: misc
 
-BIN	=	$(HOME)/bin
+SRC	=	$(HOME)/src
 LIB	= 	$(HOME)/lib
-SRC	=	$(HOME)/src
 INC	=	$(HOME)/include
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(LBIN)
-DESTLIB	=	$(LLIB)
-DESTINC	=	$(LINC)
-DESTMAN	=	$(LMAN)
+BIN	=	$(HOME)/bin
+DESTBIN	=	$(BINDIR)
+DESTLIB	=	$(LIBDIR)
+DESTINC	=	$(INCDIR)
+DESTMAN	=	$(MANDIR)
 
 #  
-INCS	= 	-I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lFITS -lohana -lm
-CFLAGS	=	$(INCS)
-LFLAGS	=	$(LIBS)
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 PROGRAMS = gconfig mknames fhead ftable fields list_astro glockfile \
Index: /trunk/Ohana/src/mosastro/Makefile
===================================================================
--- /trunk/Ohana/src/mosastro/Makefile	(revision 10304)
+++ /trunk/Ohana/src/mosastro/Makefile	(revision 10305)
@@ -6,18 +6,17 @@
 
 HOME    =       $(ROOT)/src/mosastro
+LIB	=	$(HOME)/lib
 BIN	=	$(HOME)/bin
 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) -ldvo -lFITS -lohana -lm 
-CFLAGS	=	$(INCS)
-LFLAGS	=	$(LIBS)
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 MOS = \
Index: /trunk/Ohana/src/nightd/Makefile
===================================================================
--- /trunk/Ohana/src/nightd/Makefile	(revision 10304)
+++ /trunk/Ohana/src/nightd/Makefile	(revision 10305)
@@ -4,17 +4,17 @@
 
 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 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS)
-CCFLAGS	=	$(INCS) $(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -lFITS -lohana $(LIBFLAGS) 
+INCS	= 	-I$(INC) -I$(INCDIR) -I$(XINC)
 
 NIGHTD = \
@@ -41,5 +41,5 @@
 $(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
+	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
 
 install: $(DESTBIN)/$(PROGRAM) $(DESTBIN)/srt $(DESTBIN)/ert
@@ -57,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 $@
Index: /trunk/Ohana/src/opihi/cmd.astro/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/cmd.astro/Makefile	(revision 10304)
+++ /trunk/Ohana/src/opihi/cmd.astro/Makefile	(revision 10305)
@@ -7,12 +7,10 @@
 SDIR    =       $(HOME)/cmd.astro
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-HELP    =       $(HOME)/help
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
 #  
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # astro user commands ########################
Index: /trunk/Ohana/src/opihi/cmd.basic/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/cmd.basic/Makefile	(revision 10304)
+++ /trunk/Ohana/src/opihi/cmd.basic/Makefile	(revision 10305)
@@ -7,12 +7,11 @@
 SDIR    =       $(HOME)/cmd.basic
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-HELP    =       $(HOME)/help
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+
 #  
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # basic user commands ########################
Index: /trunk/Ohana/src/opihi/cmd.data/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 10304)
+++ /trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 10305)
@@ -7,12 +7,10 @@
 SDIR    =       $(HOME)/cmd.data
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-HELP    =       $(HOME)/help
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
 #  
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # data user commands ########################
@@ -30,4 +28,5 @@
 $(SDIR)/contour.$(ARCH).o	\
 $(SDIR)/create.$(ARCH).o	\
+$(SDIR)/cumulative.$(ARCH).o	\
 $(SDIR)/cursor.$(ARCH).o	\
 $(SDIR)/cut.$(ARCH).o		\
Index: /trunk/Ohana/src/opihi/dimm/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/dimm/Makefile	(revision 10304)
+++ /trunk/Ohana/src/opihi/dimm/Makefile	(revision 10305)
@@ -7,19 +7,17 @@
 SDIR    =       $(HOME)/dimm
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-DESTHLP =       $(LHLP)/dimm
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+DESTHLP =       $(HELPDIR)/dimm
 
 #  compile flags
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
 
 # link flags 
-LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
-LIBS1   =       -lsocket -lnsl -lreadline $(TLIB) -ljpeg -ldvo -lkapa -lFITS -lohana -lX11 -lm
+LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata -lsbig 
-LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # dimm user commands and support functions #####################
@@ -47,7 +45,7 @@
 $(DESTLIB)/libsbig.a
 
-dimm: sbig $(BIN)/dimm.$(ARCH)
+dimm: sbig $(BIN)/dimm.$(ARCH) $(libs)
 
-$(BIN)/dimm.$(ARCH) : $(funcs) $(cmds) $(libs)
+$(BIN)/dimm.$(ARCH) : $(funcs) $(cmds)
 
 install: $(DESTBIN)/dimm help
Index: /trunk/Ohana/src/opihi/dvo/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/dvo/Makefile	(revision 10304)
+++ /trunk/Ohana/src/opihi/dvo/Makefile	(revision 10305)
@@ -7,19 +7,17 @@
 SDIR    =       $(HOME)/dvo
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-DESTHLP =       $(LHLP)/dvo
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+DESTHLP =       $(HELPDIR)/dvo
 
 #  compile flags
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
 
 # link flags 
-LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
-LIBS1   =       -lsocket -lnsl -lreadline $(TLIB) -ljpeg -ldvo -lkapa -lFITS -lohana -lX11 -lm
+LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # dvo user commands and support functions ########################
@@ -92,7 +90,7 @@
 $(DESTLIB)/libdatacmd.a
 
-dvo: $(BIN)/dvo.$(ARCH)
+dvo: $(BIN)/dvo.$(ARCH) $(libs)
 
-$(BIN)/dvo.$(ARCH) : $(funcs) $(cmds) $(libs)
+$(BIN)/dvo.$(ARCH) : $(funcs) $(cmds)
 
 install: $(DESTBIN)/dvo help
Index: /trunk/Ohana/src/opihi/lib.data/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/lib.data/Makefile	(revision 10304)
+++ /trunk/Ohana/src/opihi/lib.data/Makefile	(revision 10305)
@@ -7,12 +7,10 @@
 SDIR    =       $(HOME)/lib.data
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-HELP    =       $(HOME)/help
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
 #  
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # general numerical functions (libdata) #####################
Index: /trunk/Ohana/src/opihi/lib.shell/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/lib.shell/Makefile	(revision 10304)
+++ /trunk/Ohana/src/opihi/lib.shell/Makefile	(revision 10305)
@@ -7,12 +7,10 @@
 SDIR    =       $(HOME)/lib.shell
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-HELP    =       $(HOME)/help
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
 #  
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # opihi shell functions (libopihi) ########################
Index: /trunk/Ohana/src/opihi/mana/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/mana/Makefile	(revision 10304)
+++ /trunk/Ohana/src/opihi/mana/Makefile	(revision 10305)
@@ -7,20 +7,17 @@
 SDIR    =       $(HOME)/mana
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-DESTHLP =       $(LHLP)/mana
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+DESTHLP =       $(HELPDIR)/mana
 
 #  compile flags
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
 
 # link flags 
-LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
-LIBS1   =       -lsocket -lnsl -lreadline $(TLIB) -ljpeg -ldvo -lkapa -lFITS -lohana -lX11 -lpthread -lm
-# LIBS1   =       -lreadline $(TLIB) -ldvo -lkapa -lFITS -lohana -lX11 -lm
+LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # mana user commands and support functions ########################
@@ -47,7 +44,7 @@
 $(DESTLIB)/libdatacmd.a
 
-mana: $(BIN)/mana.$(ARCH)
+mana: $(BIN)/mana.$(ARCH) $(libs)
 
-$(BIN)/mana.$(ARCH) : $(mana) $(libs)
+$(BIN)/mana.$(ARCH) : $(mana)
 
 install: $(DESTBIN)/mana help
Index: /trunk/Ohana/src/opihi/pantasks/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pantasks/Makefile	(revision 10304)
+++ /trunk/Ohana/src/opihi/pantasks/Makefile	(revision 10305)
@@ -7,19 +7,17 @@
 SDIR    =       $(HOME)/pantasks
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-DESTHLP =       $(LHLP)/pantasks
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+DESTHLP =       $(HELPDIR)/pantasks
 
 #  compile flags
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
 
 # link flags 
-LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
-LIBS1   =       -lsocket -lnsl -lreadline $(TLIB) -ljpeg -ldvo -lkapa -lFITS -lohana -lX11 -lpthread -lm
+LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # sched user commands and support functions ########################
@@ -93,12 +91,12 @@
 $(DESTLIB)/libdatacmd.a
 
-pantasks: $(BIN)/pantasks.$(ARCH)
-$(BIN)/pantasks.$(ARCH) : $(single) $(funcs) $(cmds) $(libs)
+pantasks: $(BIN)/pantasks.$(ARCH) $(libs)
+$(BIN)/pantasks.$(ARCH) : $(single) $(funcs) $(cmds)
 
-pantasks_client: $(BIN)/pantasks_client.$(ARCH)
-$(BIN)/pantasks_client.$(ARCH) : $(client) $(libs)
+pantasks_client: $(BIN)/pantasks_client.$(ARCH) $(libs)
+$(BIN)/pantasks_client.$(ARCH) : $(client)
 
-pantasks_server: $(BIN)/pantasks_server.$(ARCH)
-$(BIN)/pantasks_server.$(ARCH) : $(server) $(funcs) $(cmds) $(libs)
+pantasks_server: $(BIN)/pantasks_server.$(ARCH) $(libs)
+$(BIN)/pantasks_server.$(ARCH) : $(server) $(funcs) $(cmds)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
 	$(CC) -o $@ $^ $(LFLAGS)
Index: /trunk/Ohana/src/opihi/pclient/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pclient/Makefile	(revision 10304)
+++ /trunk/Ohana/src/opihi/pclient/Makefile	(revision 10305)
@@ -7,19 +7,17 @@
 SDIR    =       $(HOME)/pclient
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-DESTHLP =       $(LHLP)/pclient
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+DESTHLP =       $(HELPDIR)/pclient
 
 #  compile flags
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
 
 # link flags 
-LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
-LIBS1   =       -lsocket -lnsl -lreadline $(TLIB) -ldvo -lkapa -lFITS -lohana -lX11 -lm
+LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -lshell -ldata 
-LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # mana user commands and support functions ########################
@@ -43,7 +41,7 @@
 $(DESTLIB)/libdata.a
 
-pclient: $(BIN)/pclient.$(ARCH)
+pclient: $(BIN)/pclient.$(ARCH) $(libs)
 
-$(BIN)/pclient.$(ARCH) : $(funcs) $(cmds) $(libs)
+$(BIN)/pclient.$(ARCH) : $(funcs) $(cmds)
 
 install: $(DESTBIN)/pclient help
Index: /trunk/Ohana/src/opihi/pcontrol/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 10304)
+++ /trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 10305)
@@ -7,19 +7,17 @@
 SDIR    =       $(HOME)/pcontrol
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-DESTHLP =       $(LHLP)/pcontrol
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+DESTHLP =       $(HELPDIR)/pcontrol
 
 #  compile flags
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
 
 # link flags 
-LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
-LIBS1   =       -lsocket -lnsl -lreadline $(TLIB) -lkapa -lFITS -lohana -lX11 -lpthread -lm
+LIBS1   =       -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -lshell -ldata 
-LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # to build the non-threaded version, remove -lpthread and comment out
@@ -74,7 +72,7 @@
 $(DESTLIB)/libdata.a
 
-pcontrol: $(BIN)/pcontrol.$(ARCH)
+pcontrol: $(BIN)/pcontrol.$(ARCH) $(libs)
 
-$(BIN)/pcontrol.$(ARCH) : $(pcontrol) $(libs)
+$(BIN)/pcontrol.$(ARCH) : $(pcontrol)
 
 install: $(DESTBIN)/pcontrol help
Index: /trunk/Ohana/src/perl/Makefile
===================================================================
--- /trunk/Ohana/src/perl/Makefile	(revision 10304)
+++ /trunk/Ohana/src/perl/Makefile	(revision 10305)
@@ -2,5 +2,5 @@
 HOME 	=	$(ROOT)/src/perl
 
-DESTBIN	=	$(LBIN)
+DESTBIN	=	$(BINDIR)
 
 perl: default
Index: /trunk/Ohana/src/photdbc/Makefile
===================================================================
--- /trunk/Ohana/src/photdbc/Makefile	(revision 10304)
+++ /trunk/Ohana/src/photdbc/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) -ldvo -lFITS -lohana -lm 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS)
-CCFLAGS	=	$(INCS) $(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 SRCLIST = \
@@ -61,5 +60,5 @@
 $(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
+	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
 
 install: $(DESTBIN)/$(PROGRAM)
@@ -77,6 +76,8 @@
 	rm -f `find . -name "#*"`
 
-.SUFFIXES: .$(ARCH).o
 
-.c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $<
+.PRECIOUS: %.$(ARCH).o
+.PRECIOUS: $(BIN)/%.$(ARCH)
+
+%.$(ARCH).o : %.c
+	$(CC) $(CFLAGS)-c $< -o $@
Index: /trunk/Ohana/src/relastro/Makefile
===================================================================
--- /trunk/Ohana/src/relastro/Makefile	(revision 10304)
+++ /trunk/Ohana/src/relastro/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) -lsocket -lnsl -ldvo -lkapa -lFITS -lohana -lm 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS)
-CCFLAGS	=	$(INCS) $(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 RELPHOT = \
@@ -62,5 +61,5 @@
 
 $(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
+	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
 
 install: $(DESTBIN)/$(PROGRAM)
@@ -78,6 +77,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 $@
Index: /trunk/Ohana/src/relphot/Makefile
===================================================================
--- /trunk/Ohana/src/relphot/Makefile	(revision 10304)
+++ /trunk/Ohana/src/relphot/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) -lsocket -lnsl -ldvo -lkapa -lFITS -lohana -lm 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS)
-CCFLAGS	=	$(INCS) $(LIBS) 
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) -ldvo -lkapa -lFITS -lohana $(LIBFLAGS) 
 
 RELPHOT = \
@@ -54,5 +53,6 @@
 
 $(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
+	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
+	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
 
 install: $(DESTBIN)/$(PROGRAM)
@@ -70,6 +70,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 $@
Index: /trunk/Ohana/src/shell/Makefile
===================================================================
--- /trunk/Ohana/src/shell/Makefile	(revision 10304)
+++ /trunk/Ohana/src/shell/Makefile	(revision 10305)
@@ -2,5 +2,5 @@
 HOME 	=	$(ROOT)/src/shell
 
-DESTBIN	=	$(LBIN)
+DESTBIN	=	$(BINDIR)
 
 shell:
Index: /trunk/Ohana/src/skycalc/Makefile
===================================================================
--- /trunk/Ohana/src/skycalc/Makefile	(revision 10304)
+++ /trunk/Ohana/src/skycalc/Makefile	(revision 10305)
@@ -7,11 +7,11 @@
 MAN	= 	$(HOME)/doc
 BIN	= 	$(HOME)/bin
-DESTBIN	=	$(LBIN)
-DESTLIB	=	$(LLIB)
-DESTINC	=	$(LINC)
-DESTMAN	=	$(LMAN)
+DESTBIN	=	$(BINDIR)
+DESTLIB	=	$(LIBDIR)
+DESTINC	=	$(INCDIR)
+DESTMAN	=	$(MANDIR)
 
-INCS	=	-I$(INC) -I$(LINC)
-LIBS	= 	-L$(LLIB)
+INCS	=	-I$(INC) -I$(INCDIR)
+LIBS	= 	-L$(LIB) -L$(LIBDIR)
 CFLAGS	=	-g -o $*.$(ARCH).o $(INCS)
 CCFLAGS	=	$(INCS) $(LIBS)
Index: /trunk/Ohana/src/tcl/Makefile
===================================================================
--- /trunk/Ohana/src/tcl/Makefile	(revision 10304)
+++ /trunk/Ohana/src/tcl/Makefile	(revision 10305)
@@ -2,5 +2,5 @@
 HOME 	=	$(ROOT)/src/tcl
 
-DESTBIN	=	$(LBIN)
+DESTBIN	=	$(BINDIR)
 
 tcl:
Index: /trunk/Ohana/src/uniphot/Makefile
===================================================================
--- /trunk/Ohana/src/uniphot/Makefile	(revision 10304)
+++ /trunk/Ohana/src/uniphot/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) -ldvo -lFITS -lohana -lm 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS) -Wall
-CCFLAGS	=	$(INCS) $(LIBS) -Wall
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 UNIPHOT = \
@@ -47,5 +46,5 @@
 $(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
+	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
 
 install: $(DESTBIN)/$(PROGRAM)
@@ -63,6 +62,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 $@