Index: /trunk/Ohana/Makefile
===================================================================
--- /trunk/Ohana/Makefile	(revision 10341)
+++ /trunk/Ohana/Makefile	(revision 10342)
@@ -36,8 +36,6 @@
 gcompare    \
 imclean     \
-imregister  \
 kapa        \
 kii         \
-misc        \
 mosastro    \
 nightd      \
@@ -48,4 +46,10 @@
 tcl         \
 uniphot
+
+# XXXX these need to be updated after the makefile system re-org
+FIXME = \
+imregister  \
+misc        
+
 
 # any of these programs can be built with 'make (name)' 
@@ -79,9 +83,9 @@
 	@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 $(INCDIR)
-	mkdir -p $(LIBDIR)
+	mkdir -p $(DESTINC)
+	mkdir -p $(DESTLIB)
 	for i in $(LIBS-$(ARCH)); do make $$i.install || exit; done
 	chmod +x ohana-config
-	cp -f ohana-config $(BINDIR)/
+	cp -f ohana-config $(DESTBIN)/
 
 bins: 
Index: /trunk/Ohana/src/addstar/Makefile
===================================================================
--- /trunk/Ohana/src/addstar/Makefile	(revision 10341)
+++ /trunk/Ohana/src/addstar/Makefile	(revision 10342)
@@ -7,11 +7,21 @@
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
+INC	= 	$(HOME)/include
 include ../../Makefile.Common
 
-CFLAGS	:=	$(CFLAGS) -fPIC
 LDFLAGS := 	-lkapa -ldvo -lFITS -lohana $(LDFLAGS)
+
+addstar     : $(BIN)/addstar.$(ARCH)
+addstard    : $(BIN)/addstard.$(ARCH)
+addstart    : $(BIN)/addstart.$(ARCH)
+addstarc    : $(BIN)/addstarc.$(ARCH)
+mkacc-2mass : $(BIN)/mkacc-2mass.$(ARCH)
+sedstar     : $(BIN)/sedstar.$(ARCH)
+load2mass   : $(BIN)/load2mass.$(ARCH)
+gztest      : $(BIN)/gztest.$(ARCH)
+
+all: addstar addstarc addstard addstart sedstar load2mass
 
 ADDSTAR = \
@@ -196,36 +206,16 @@
 $(ADDSTAR)  : $(INC)/addstar.h
 
-addstar                : $(BIN)/addstar.$(ARCH)
 $(BIN)/addstar.$(ARCH) : $(ADDSTAR)
-
-addstard                : $(BIN)/addstard.$(ARCH)
 $(BIN)/addstard.$(ARCH) : $(ADDSTARD)
-
-addstart                : $(BIN)/addstart.$(ARCH)
 $(BIN)/addstart.$(ARCH) : $(ADDSTART)
-
-addstarc                : $(BIN)/addstarc.$(ARCH)
 $(BIN)/addstarc.$(ARCH) : $(ADDSTARC)
-
-mkacc-2mass                : $(BIN)/mkacc-2mass.$(ARCH)
 $(BIN)/mkacc-2mass.$(ARCH) : $(MKACC-2MASS)
-mkacc-2mass.install        : $(DESTBIN)/mkacc-2mass
-
-sedstar                  : $(BIN)/sedstar.$(ARCH)
 $(BIN)/sedstar.$(ARCH)   : $(SEDSTAR)
-sedstar.install          : $(DESTBIN)/sedstar
-
-load2mass                : $(BIN)/load2mass.$(ARCH)
 $(BIN)/load2mass.$(ARCH) : $(LOAD-2MASS)
-load2mass.install        : $(DESTBIN)/load2mass
-
-gztest                  : $(BIN)/gztest.$(ARCH)
-
-all: addstar addstarc addstard addstart sedstar load2mass
 
 INSTALL = addstar addstarc addstard addstart sedstar load2mass
 
 # dependancy rules for binary code #########################
-$(INSTALL) $(DEVEL): % : $(BIN)/%.$(ARCH)
+$(INSTALL): % : $(BIN)/%.$(ARCH)
 
 %.clean :
Index: /trunk/Ohana/src/delstar/Makefile
===================================================================
--- /trunk/Ohana/src/delstar/Makefile	(revision 10341)
+++ /trunk/Ohana/src/delstar/Makefile	(revision 10342)
@@ -1,7 +1,8 @@
+default: delstar
+help:
+	@echo "make options: addstar (default)"
+
 include ../../Configure
-
 HOME 	=	$(ROOT)/src/delstar
-PROGRAM =       delstar
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
@@ -9,12 +10,11 @@
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+include ../../Makefile.Common
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+CFLAGS	:=	$(CFLAGS) -fPIC
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+
+delstar: $(BIN)/delstar.$(ARCH)
+install: $(DESTBIN)/delstar
 
 DELSTAR = \
@@ -39,46 +39,4 @@
 $(SRC)/RegionOps.$(ARCH).o   	  
 
-default: $(PROGRAM)
-help:
-	@echo "make options: delstar (default)"
-
 $(DELSTAR): $(INC)/delstar.h
 $(BIN)/delstar.$(ARCH) : $(DELSTAR)
-delstar   : $(BIN)/delstar.$(ARCH)
-
-INSTALL = delstar
-
-# dependancy rules for binary code #########################
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $^ -o $@ $(LFLAGS)
-
-$(DESTBIN)/%: $(BIN)/%.$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$*
-	cp $(BIN)/$*.$(ARCH) $(DESTBIN)/$*
-
-$(INSTALL) $(DEVEL): % : $(BIN)/%.$(ARCH)
-
-%.clean :
-	rm -f $(BIN)/$*.$(ARCH)
-
-%.install:
-	make $(DESTBIN)/$*
-
-# utilities #################################################
-
-install:
-	for i in $(INSTALL); do make $$i.install; done
-
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
Index: /trunk/Ohana/src/fixcat/Makefile
===================================================================
--- /trunk/Ohana/src/fixcat/Makefile	(revision 10341)
+++ /trunk/Ohana/src/fixcat/Makefile	(revision 10342)
@@ -1,21 +1,19 @@
+default: uniphot
+help:
+	@echo "make options: uniphot (default)"
+
 include ../../Configure
-CC      =       gcc -g  # override this for now for minimal test
 HOME 	=	$(ROOT)/src/fixcat
-CONFIG  =	$(ROOT)/config
-PROGRAM =       fixcat
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+
+uniphot: $(BIN)/uniphot.$(ARCH)
+install: $(DESTBIN)/uniphot
 
 FIXCAT = \
@@ -29,35 +27,4 @@
 $(SRC)/find_matches.$(ARCH).o	$(SRC)/check_permissions.$(ARCH).o
 
-
-OBJ = $(FIXCAT)
-
-default: $(PROGRAM)
-
-$(MARKSTAR): $(INC)/markstar.h
-
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM)
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(UNIPHOT): $(INC)/uniphot.h
+$(BIN)/uniphot.$(ARCH): $(UNIPHOT)
Index: /trunk/Ohana/src/gastro/Makefile
===================================================================
--- /trunk/Ohana/src/gastro/Makefile	(revision 10341)
+++ /trunk/Ohana/src/gastro/Makefile	(revision 10342)
@@ -4,22 +4,18 @@
 
 include ../../Configure
-
 HOME 	=	$(ROOT)/src/gastro
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
 
-# -----------------------
-OBJ	= \
+gastro: $(BIN)/gastro.$(ARCH)
+install: $(DESTBIN)/gastro
+
+GASTRO	= \
 $(SRC)/gastro.$(ARCH).o \
 $(SRC)/gstars.$(ARCH).o \
@@ -42,49 +38,5 @@
 $(SRC)/misc.$(ARCH).o
 
-#$(SRC)/gregions2.$(ARCH).o \
-#$(SRC)/gcatalog.$(ARCH).o \
-#$(SRC)/gptolemy.$(ARCH).o \
-#$(SRC)/g2mass.$(ARCH).o \
+$(GASTRO): $(INC)/gastro.h
+$(BIN)/gastro.$(ARCH): $(GASTRO)
 
-gastro: $(BIN)/gastro.$(ARCH)
-
-$(BIN)/gastro.$(ARCH): $(OBJ)
-
-$(OBJ): $(INC)/gastro.h
-
-INSTALL = gastro
-
-# generic dependancy rules for binary code #########################
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $^ -o $@ $(LFLAGS)
-
-$(DESTBIN)/%: $(BIN)/%.$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$*
-	cp $(BIN)/$*.$(ARCH) $(DESTBIN)/$*
-
-$(INSTALL) $(DEVEL): % : $(BIN)/%.$(ARCH)
-
-%.clean :
-	rm -f $(BIN)/$*.$(ARCH)
-
-%.install:
-	make $(DESTBIN)/$*
-
-# utilities #################################################
-
-install:
-	for i in $(INSTALL); do make $$i.install; done
-
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
Index: /trunk/Ohana/src/gastro2/Makefile
===================================================================
--- /trunk/Ohana/src/gastro2/Makefile	(revision 10341)
+++ /trunk/Ohana/src/gastro2/Makefile	(revision 10342)
@@ -1,21 +1,23 @@
+default: gastro2
+help:
+	@echo "make options: gastro2 (default)"
+
 include ../../Configure
 HOME 	=	$(ROOT)/src/gastro2
-PROGRAM =       gastro2
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
 
-2MASS = \
+gastro2: $(BIN)/gastro2.$(ARCH)
+coordtest: $(BIN)/coordtest.$(ARCH)
+extr2mass: $(BIN)/extr2mass.$(ARCH)
+install: $(DESTBIN)/gastro2
+
+EXTR2MASS = \
 $(SRC)/extr2mass.$(ARCH).o \
 $(SRC)/ConfigInit.$(ARCH).o \
@@ -27,5 +29,5 @@
 $(SRC)/polyfit.$(ARCH).o
 
-GASTRO = \
+GASTRO2 = \
 $(SRC)/plots.$(ARCH).o \
 $(SRC)/gheader2.$(ARCH).o \
@@ -54,42 +56,9 @@
 $(SRC)/rtext.$(ARCH).o
 
-#$(SRC)/gptolemy2.$(ARCH).o \
-#$(SRC)/gregions2.$(ARCH).o \
+$(GASTRO2): $(INC)/gastro2.h
+$(COORDTEST): $(INC)/gastro2.h
+$(EXTR2MASS): $(INC)/gastro2.h
 
-OBJ = $(GASTRO)
-
-default: $(PROGRAM)
-
-all: $(PROGRAM) extr2mass
-
-$(GASTRO): $(INC)/gastro2.h
-
-coordtest: $(COORDTEST)
-	$(CC) $(COORDTEST) -o $(BIN)/coordtest.linux $(LFLAGS)
-
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM)
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN)/gastro2.$(ARCH): $(GASTRO2)
+$(BIN)/coordtest.$(ARCH): $(COORDTEST)
+$(BIN)/extr2mass.$(ARCH): $(EXTR2MASS)
Index: /trunk/Ohana/src/gcompare/Makefile
===================================================================
--- /trunk/Ohana/src/gcompare/Makefile	(revision 10341)
+++ /trunk/Ohana/src/gcompare/Makefile	(revision 10342)
@@ -1,6 +1,8 @@
+default: gcompare
+help:
+	@echo "make options: gcompare (default)"
+
 include ../../Configure
 HOME 	=	$(ROOT)/src/gcompare
-default: all
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
@@ -8,59 +10,17 @@
 SRC	=	$(HOME)/src
 INC	=	$(HOME)/include
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+include ../../Makefile.Common
 
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
 
-INSTALL = gcompare
+gcompare: $(BIN)/gcompare.$(ARCH)
+install: $(DESTBIN)/gcompare
 
-OBJ 	= \
+GCOMPARE 	= \
 $(SRC)/input.$(ARCH).o 				$(SRC)/output.$(ARCH).o    		\
 $(SRC)/compare.$(ARCH).o 			$(SRC)/sort.$(ARCH).o      		\
 $(SRC)/count_neighbors.$(ARCH).o                $(SRC)/nextline.$(ARCH).o		\
-$(SRC)/nextword.$(ARCH).o
+$(SRC)/nextword.$(ARCH).o			$(SRC)/gcompare.$(ARCH).o
 
-all: gcompare
-
-# dependancy rules for binary code ##########################
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-.PRECIOUS: $(SRC)/%.$(ARCH).o
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $^ -o $@
-
-$(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o $(OBJ)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $^ -o $@ $(LFLAGS)
-
-$(DESTBIN)/%: $(BIN)/%.$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$*
-	cp $(BIN)/$*.$(ARCH) $(DESTBIN)/$*
-
-%.install:
-	make $(DESTBIN)/$*
-
-$(INSTALL): % : $(BIN)/%.$(ARCH)
-
-# utilities #################################################
-clean:
-	rm -f *~ 
-	rm -f #* 
-	rm -f */*~ 
-	rm -f */#* 
-	rm -f */*.o
-	rm -f $(BIN)/gcompare.$(ARCH)
-
-dist: clean
-	rm -f $(BIN)/gcompare
-
-install:
-	for i in $(INSTALL); do make $$i.install; done
-	mkdir -p $(DESTMAN)
-	rm -f $(DESTMAN)/gcompare.1
-	cp $(MAN)/gcompare.1 $(DESTMAN)/
+$(GCOMPARE): $(INC)/gcompare.h
+$(BIN)/gcompare.$(ARCH): $(GCOMPARE)
Index: /trunk/Ohana/src/getstar/Makefile
===================================================================
--- /trunk/Ohana/src/getstar/Makefile	(revision 10341)
+++ /trunk/Ohana/src/getstar/Makefile	(revision 10342)
@@ -1,19 +1,19 @@
+default: getstar
+help:
+	@echo "make options: getstar (default)"
+
 include ../../Configure
 HOME 	=	$(ROOT)/src/getstar
-PROGRAM =       getstar
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+
+getstar: $(BIN)/getstar.$(ARCH)
+install: $(DESTBIN)/getstar
 
 GETSTAR = \
@@ -25,34 +25,4 @@
 $(SRC)/select_by_region.$(ARCH).o
 
-OBJ = $(GETSTAR)
-
-default: $(PROGRAM)
-
 $(GETSTAR): $(INC)/getstar.h
-
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM)
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN)/getstar.$(ARCH): $(GETSTAR)
Index: /trunk/Ohana/src/gophot/Makefile
===================================================================
--- /trunk/Ohana/src/gophot/Makefile	(revision 10341)
+++ /trunk/Ohana/src/gophot/Makefile	(revision 10342)
@@ -4,21 +4,18 @@
 
 include ../../Configure
-
 HOME    =       $(ROOT)/src/gophot
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
 
-OBJ = \
+gophot: $(BIN)/gophot.$(ARCH)
+install: $(DESTBIN)/gophot
+
+GOPHOT = \
 $(SRC)/gophot.$(ARCH).o 	$(SRC)/ConfigInit.$(ARCH).o \
 $(SRC)/message.$(ARCH).o	$(SRC)/dophot.$(ARCH).o \
@@ -43,42 +40,4 @@
 $(SRC)/feature_fluxes.$(ARCH).o $(SRC)/mediansky.$(ARCH).o
 
-$(OBJ)                : $(INC)/gophot.h $(INC)/prototypes.h
-$(BIN)/gophot.$(ARCH) : $(OBJ)
-gophot                : $(BIN)/gophot.$(ARCH)
-
-INSTALL = gophot
-
-# dependancy rules for binary code #########################
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $^ -o $@ $(LFLAGS)
-
-$(DESTBIN)/%: $(BIN)/%.$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$*
-	cp $(BIN)/$*.$(ARCH) $(DESTBIN)/$*
-
-$(INSTALL) $(DEVEL): % : $(BIN)/%.$(ARCH)
-
-%.clean :
-	rm -f $(BIN)/$*.$(ARCH)
-
-%.install:
-	make $(DESTBIN)/$*
-
-# utilities #################################################
-
-install:
-	for i in $(INSTALL); do make $$i.install; done
-
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
+$(GOPHOT): $(INC)/gophot.h $(INC)/prototypes.h
+$(BIN)/gophot.$(ARCH): $(GOPHOT)
Index: /trunk/Ohana/src/imclean/Makefile
===================================================================
--- /trunk/Ohana/src/imclean/Makefile	(revision 10341)
+++ /trunk/Ohana/src/imclean/Makefile	(revision 10342)
@@ -1,21 +1,21 @@
+default: imclean
+help:
+	@echo "make options: imclean (default)"
+
 include ../../Configure
 HOME    =       $(ROOT)/src/imclean
-PROGRAM =       imclean
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
 
-OBJ = \
+imclean: $(BIN)/imclean.$(ARCH)
+install: $(DESTBIN)/imclean
+
+IMCLEAN = \
 $(SRC)/imclean.$(ARCH).o	$(SRC)/ConfigInit.$(ARCH).o \
 $(SRC)/args.$(ARCH).o		$(SRC)/sort_stars.$(ARCH).o \
@@ -26,32 +26,4 @@
 $(SRC)/wfits.$(ARCH).o
 
-default: $(PROGRAM)
-
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM)
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:	
-	rm -f *~
-	rm -f #*
-	rm -f */*~
-	rm -f */#*
-	rm -f $(SRC)/*.o
-	rm -f $(BIN)/*.$(ARCH)
-
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(IMCLEAN): $(INC)/imclean.h
+$(BIN)/imclean.$(ARCH): $(IMCLEAN)
Index: /trunk/Ohana/src/kapa/Makefile
===================================================================
--- /trunk/Ohana/src/kapa/Makefile	(revision 10341)
+++ /trunk/Ohana/src/kapa/Makefile	(revision 10342)
@@ -1,37 +1,23 @@
+default: kapa
+help:
+	@echo "make options: kapa (default)"
+
 include ../../Configure
 HOME 	=	$(ROOT)/src/kapa
-PROGRAM =       kapa
-
-default: $(PROGRAM)
-
 LIB	=	$(HOME)/lib
-INC	=	$(HOME)/include
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-BDIR	=	$(HOME)/button
-CDIR	=	$(HOME)/colorbar
 EDIR	=	$(HOME)/event
-MDIR	=	$(HOME)/misc
-ODIR	=	$(HOME)/overlay
-PDIR	=	$(HOME)/picture
 GDIR	=	$(HOME)/graph
 SDIR	=	$(HOME)/setup
-ZDIR	=	$(HOME)/zoom
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
-#
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -lkapa -ldvo -lFITS -lohana $(LIBFLAGS) 
+INC	=	$(HOME)/include
+include ../../Makefile.Common
+
+LDFLAGS := 	-lkapa -ldvo -lFITS -lohana $(LDFLAGS)
+
+kapa: $(BIN)/kapa.$(ARCH)
+install: $(DESTBIN)/kapa
 
 # local source / object files ########################
-BOBJ = \
-$(BDIR)/ButtonFunctions.$(ARCH).o         $(BDIR)/InButton.$(ARCH).o           \
-$(BDIR)/CheckButtons.$(ARCH).o     	  $(BDIR)/InPicture.$(ARCH).o          \
-$(BDIR)/DrawButton.$(ARCH).o       	  $(BDIR)/InvertButton.$(ARCH).o       \
-$(BDIR)/FlashButton.$(ARCH).o      	  $(BDIR)/PSit.$(ARCH).o               \
-$(SDIR)/DrawBitmap.$(ARCH).o               
-
 EOBJ = \
 $(EDIR)/CheckPipe.$(ARCH).o               $(EDIR)/Stop.$(ARCH).o               \
@@ -72,5 +58,5 @@
 $(SDIR)/MakeCursor.$(ARCH).o
 
-OBJ  =  $(EOBJ) $(GOBJ) $(MOBJ) $(SOBJ) $(BDRAW)
+OBJ  =  $(EOBJ) $(GOBJ) $(SOBJ) $(BDRAW)
 
 # dependancy rules for include files ########################
@@ -80,33 +66,3 @@
 	$(INC)/prototypes.h
 
-#### nothing program-dependant below ####
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) -o $@ $^ $(LFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM)
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-dist: clean
-	rm -f */*.*.o
-	rm -f $(BIN)/$(PROGRAM).*
-
-.SUFFIXES: .$(ARCH).o
-
-%.$(ARCH).o : %.c
-	$(CC) -o $@ -c $< $(CFLAGS)
-
+$(BIN)/kapa.$(ARCH): $(OBJ)
Index: /trunk/Ohana/src/kii/Makefile
===================================================================
--- /trunk/Ohana/src/kii/Makefile	(revision 10341)
+++ /trunk/Ohana/src/kii/Makefile	(revision 10342)
@@ -1,9 +1,8 @@
+default: kii
+help:
+	@echo "make options: kii (default)"
+
 include ../../Configure
 HOME 	=	$(ROOT)/src/kii
-PROGRAM =       kii
-
-default: $(PROGRAM)
-
-INC	=	$(HOME)/include
 LIB	=	$(HOME)/lib
 BIN	=	$(HOME)/bin
@@ -16,11 +15,11 @@
 SDIR	=	$(HOME)/setup
 ZDIR	=	$(HOME)/zoom
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
-#
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lkapa -lohana $(LIBFLAGS) 
+INC	=	$(HOME)/include
+include ../../Makefile.Common
+
+LDFLAGS := 	-lkapa -ldvo -lFITS -lohana $(LDFLAGS)
+
+kii: $(BIN)/kii.$(ARCH)
+install: $(DESTBIN)/kii
 
 # local source / object files ########################
@@ -84,5 +83,4 @@
 $(ZDIR)/CreateZoom16.$(ARCH).o
 
-
 OBJ  =  $(BOBJ) $(COBJ) $(EOBJ) $(MOBJ) $(OOBJ) $(POBJ) $(SOBJ) $(ZOBJ)
 
@@ -93,34 +91,3 @@
 	$(INC)/prototypes.h
 
-#### nothing program-dependant below ####
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) -o $@ $^ $(LFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM)
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-dist: clean
-	rm -f */*.*.o
-	rm -f $(BIN)/$(PROGRAM).*
-
-.SUFFIXES: .$(ARCH).o
-
-%.$(ARCH).o : %.c
-	$(CC) -o $@ -c $< $(CFLAGS)
-
-
+$(BIN)/kii.$(ARCH): $(OBJ)
Index: /trunk/Ohana/src/libdvo/Makefile
===================================================================
--- /trunk/Ohana/src/libdvo/Makefile	(revision 10341)
+++ /trunk/Ohana/src/libdvo/Makefile	(revision 10342)
@@ -14,4 +14,6 @@
 ADEF	=	$(AUTO)/def
 include ../../Makefile.Common
+
+CFLAGS	:=	$(CFLAGS) -fPIC
 
 default: install
Index: /trunk/Ohana/src/libtap/Makefile
===================================================================
--- /trunk/Ohana/src/libtap/Makefile	(revision 10341)
+++ /trunk/Ohana/src/libtap/Makefile	(revision 10342)
@@ -12,4 +12,6 @@
 include ../../Makefile.Common
 
+CFLAGS	:=	$(CFLAGS) -fPIC
+
 install: $(DESTLIB)/libtap_ohana.a $(DESTLIB)/libtap_ohana.so
 libtap: $(LIB)/libtap_ohana.$(ARCH).a $(LIB)/libtap_ohana.$(ARCH).so
Index: /trunk/Ohana/src/lightcurve/Makefile
===================================================================
--- /trunk/Ohana/src/lightcurve/Makefile	(revision 10341)
+++ /trunk/Ohana/src/lightcurve/Makefile	(revision 10342)
@@ -1,23 +1,21 @@
+default: lightcurve
+help:
+	@echo "make options: lightcurve (default)"
+
 include ../../Configure
-PROGRAM =	lightcurve
 HOME 	=	$(ROOT)/lightcurve
-
-default: $(PROGRAM)
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
 
-OBJS = \
+lightcurve: $(BIN)/lightcurve.$(ARCH)
+install: $(DESTBIN)/lightcurve
+
+LIGHTCURVE = \
 $(SRC)/args.$(ARCH).o 		$(SRC)/get_names.$(ARCH).o \
 $(SRC)/get_stars.$(ARCH).o 	$(SRC)/sort_stars.$(ARCH).o \
@@ -28,33 +26,4 @@
 $(SRC)/help.$(ARCH).o 
 
-$(OBJS): $(INC)/lightcurve.h
-
-$(PROGRAM):	$(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJS)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJS) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
-
-# -----------------------
-install:
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-#	rm -f $(DESTMAN)/$(PROGRAM).1
-	cp $(BIN)/$(PROGRAM).$(ARCH)   $(DESTBIN)/
-#	cp $(MAN)/$(PROGRAM).1 $(DESTMAN)/
-
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-dist: clean
-	rm -f $(BIN)/$(PROGRAM)
-
-
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS)-c $< -o $@
+$(LIGHTCURVE): $(INC)/lightcurve.h
+$(BIN)/lightcurve.$(ARCH): $(LIGHTCURVE)
Index: /trunk/Ohana/src/markrock/Makefile
===================================================================
--- /trunk/Ohana/src/markrock/Makefile	(revision 10341)
+++ /trunk/Ohana/src/markrock/Makefile	(revision 10342)
@@ -1,20 +1,19 @@
+default: markrock
+help:
+	@echo "make options: markrock (default)"
+
 include ../../Configure
 HOME 	=	$(ROOT)/src/markrock
-CONFIG  =	$(ROOT)/config
-PROGRAM =       markrock
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+
+markrock: $(BIN)/markrock.$(ARCH)
+install: $(DESTBIN)/markrock
 
 MARKROCK = \
@@ -32,35 +31,4 @@
 $(SRC)/count_neighbors.$(ARCH).o
 
-
-OBJ = $(MARKROCK)
-
-default: $(PROGRAM)
-
 $(MARKROCK): $(INC)/markrock.h
-
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM)
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS)-c $< -o $@
+$(BIN)/markrock.$(ARCH): $(MARKROCK)
Index: /trunk/Ohana/src/markstar/Makefile
===================================================================
--- /trunk/Ohana/src/markstar/Makefile	(revision 10341)
+++ /trunk/Ohana/src/markstar/Makefile	(revision 10342)
@@ -1,20 +1,19 @@
+default: markstar
+help:
+	@echo "make options: markstar (default)"
+
 include ../../Configure
 HOME 	=	$(ROOT)/src/markstar
-CONFIG  =	$(ROOT)/config
-PROGRAM =       markstar
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+
+markstar: $(BIN)/markstar.$(ARCH)
+install: $(DESTBIN)/markstar
 
 MARKSTAR = \
@@ -32,35 +31,4 @@
 $(SRC)/find_matches.$(ARCH).o	$(SRC)/check_permissions.$(ARCH).o
 
-
-OBJ = $(MARKSTAR)
-
-default: $(PROGRAM)
-
 $(MARKSTAR): $(INC)/markstar.h
-
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM)
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS)-c $< -o $@
+$(BIN)/markstar.$(ARCH): $(MARKSTAR)
Index: /trunk/Ohana/src/mosastro/Makefile
===================================================================
--- /trunk/Ohana/src/mosastro/Makefile	(revision 10341)
+++ /trunk/Ohana/src/mosastro/Makefile	(revision 10342)
@@ -4,19 +4,19 @@
 
 include ../../Configure
-
 HOME    =       $(ROOT)/src/mosastro
 LIB	=	$(HOME)/lib
 BIN	=	$(HOME)/bin
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+
+mosastro: $(BIN)/mosastro.$(ARCH)
+mkstandards: $(BIN)/mkstandards.$(ARCH)
+mkobs: $(BIN)/mkobs.$(ARCH)
+warptest: $(BIN)/warptest.(ARCH)
+install: $(DESTBIN)/mosastro $(DESTBIN)/mosastro $(DESTBIN)/mosastro
 
 MOS = \
@@ -57,7 +57,4 @@
 $(SRC)/wstars.$(ARCH).o
 
-mosastro: $(BIN)/mosastro.$(ARCH)
-$(BIN)/mosastro.$(ARCH) : $(MOS)
-
 STD = \
 $(SRC)/mkstandards.$(ARCH).o \
@@ -66,7 +63,4 @@
 $(SRC)/wstars.$(ARCH).o \
 $(SRC)/wfits.$(ARCH).o
-
-mkstandards: $(BIN)/mkstandards.$(ARCH)
-$(BIN)/mkstandards.$(ARCH) : $(STD)
 
 OBS = \
@@ -92,49 +86,10 @@
 $(SRC)/wstars.$(ARCH).o
 
-mkobs: $(BIN)/mkobs.$(ARCH)
-$(BIN)/mkobs.$(ARCH) : $(OBS)
-
-warptest: $(BIN)/warptest.(ARCH)
-$(BIN)/warptest.(ARCH) : $(SRC)/warptest.$(ARCH).o
-
 $(MOS) : $(INC)/mosastro.h
 $(OBS) : $(INC)/mosastro.h
 $(STD) : $(INC)/mosastro.h
 
-# INSTALL = mosastro mkstandards mkobs
-INSTALL = mosastro
-
-# dependancy rules for binary code #########################
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $^ -o $@ $(LFLAGS)
-
-$(DESTBIN)/%: $(BIN)/%.$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$*
-	cp $(BIN)/$*.$(ARCH) $(DESTBIN)/$*
-
-$(INSTALL) $(DEVEL): % : $(BIN)/%.$(ARCH)
-
-%.clean :
-	rm -f $(BIN)/$*.$(ARCH)
-
-%.install:
-	make $(DESTBIN)/$*
-
-# utilities #################################################
-
-install:
-	for i in $(INSTALL); do make $$i.install; done
-
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
+$(BIN)/mosastro.$(ARCH) : $(MOS)
+$(BIN)/mkstandards.$(ARCH) : $(STD)
+$(BIN)/mkobs.$(ARCH) : $(OBS)
+$(BIN)/warptest.(ARCH) : $(SRC)/warptest.$(ARCH).o
Index: /trunk/Ohana/src/nightd/Makefile
===================================================================
--- /trunk/Ohana/src/nightd/Makefile	(revision 10341)
+++ /trunk/Ohana/src/nightd/Makefile	(revision 10342)
@@ -1,20 +1,19 @@
+default: nightd
+help:
+	@echo "make options: nightd (default)"
+
 include ../../Configure
 HOME 	=	$(ROOT)/src/nightd
-PROGRAM =       nightd
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -lFITS -lohana $(LIBFLAGS) 
-INCS	= 	-I$(INC) -I$(INCDIR) -I$(XINC)
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+
+nightd: $(BIN)/nightd.$(ARCH)
+install: $(DESTBIN)/nightd
 
 NIGHTD = \
@@ -24,40 +23,4 @@
 $(SRC)/misc.$(ARCH).o
 
-OBJ = $(NIGHTD)
-
-default: $(PROGRAM)
-
-$(DESTBIN)/srt: $(DESTBIN)/$(PROGRAM)
-	cp $(DESTBIN)/$(PROGRAM) $(DESTBIN)/srt
-
-$(DESTBIN)/ert: $(DESTBIN)/$(PROGRAM)
-	cp $(DESTBIN)/$(PROGRAM) $(DESTBIN)/ert
-
 $(NIGHTD): $(INC)/nightd.h
-
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM) $(DESTBIN)/srt $(DESTBIN)/ert
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS)-c $< -o $@
+$(BIN)/nightd.$(ARCH): $(NIGHTD)
Index: /trunk/Ohana/src/opihi/Makefile.Common
===================================================================
--- /trunk/Ohana/src/opihi/Makefile.Common	(revision 10341)
+++ /trunk/Ohana/src/opihi/Makefile.Common	(revision 10342)
@@ -2,4 +2,6 @@
 # utilities #################################################
 # .SUFFIXES: .$(ARCH).o
+
+CFLAGS  =       -I$(INC) -I$(DESTINC) $(INCDIRS) -DHELPDIR_DEFAULT=$(HELP)
 
 $(BIN)/%.$(ARCH):
@@ -35,8 +37,8 @@
 
 %.help:
-	@if [ ! -d $(DESTHLP) ]; then mkdir -p $(DESTHLP); fi
+	@if [ ! -d $(HELP) ]; then mkdir -p $(HELP); fi
 	rm -f $(HOME)/$*/help/*~
 	rm -f $(HOME)/$*/help/#*
-	for i in `find $(HOME)/$*/help -maxdepth 1 -type f`; do cp -f $$i $(DESTHLP); done
+	for i in `find $(HOME)/$*/help -maxdepth 1 -type f`; do cp -f $$i $(HELP); done
 %.clean:
 	rm -f $(BIN)/$*.$(ARCH)
@@ -58,4 +60,4 @@
 
 clean-help:
-	@if [ ! -d $(DESTHLP) ]; then mkdir -p $(DESTHLP); fi
-	rm -f $(DESTHLP)/*
+	@if [ ! -d $(HELP) ]; then mkdir -p $(HELP); fi
+	rm -f $(HELP)/*
Index: /trunk/Ohana/src/opihi/cmd.astro/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/cmd.astro/Makefile	(revision 10341)
+++ /trunk/Ohana/src/opihi/cmd.astro/Makefile	(revision 10342)
@@ -6,11 +6,4 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/cmd.astro
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-#  
-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 10341)
+++ /trunk/Ohana/src/opihi/cmd.basic/Makefile	(revision 10342)
@@ -6,12 +6,4 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/cmd.basic
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-
-#  
-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 10341)
+++ /trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 10342)
@@ -6,11 +6,4 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/cmd.data
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-#  
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # data user commands ########################
Index: /trunk/Ohana/src/opihi/dimm/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/dimm/Makefile	(revision 10341)
+++ /trunk/Ohana/src/opihi/dimm/Makefile	(revision 10342)
@@ -6,18 +6,10 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/dimm
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-DESTHLP =       $(HELPDIR)/dimm
-
-#  compile flags
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
+HELP    =       $(DESTHELP)/dimm
 
 # link flags 
 LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata -lsbig 
-LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # dimm user commands and support functions #####################
Index: /trunk/Ohana/src/opihi/dvo/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/dvo/Makefile	(revision 10341)
+++ /trunk/Ohana/src/opihi/dvo/Makefile	(revision 10342)
@@ -6,18 +6,10 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/dvo
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-DESTHLP =       $(HELPDIR)/dvo
-
-#  compile flags
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
+HELP    =       $(DESTHELP)/dvo
 
 # link flags 
 LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # dvo user commands and support functions ########################
@@ -96,5 +88,5 @@
 install: $(DESTBIN)/dvo help
 
-help: cmd.basic.help cmd.data.help cmd.astro.help dvo.help
+help: clean-help cmd.basic.help cmd.data.help cmd.astro.help dvo.help
 
 $(funcs) $(cmds) $(libs) : $(INC)/dvoshell.h
Index: /trunk/Ohana/src/opihi/lib.data/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/lib.data/Makefile	(revision 10341)
+++ /trunk/Ohana/src/opihi/lib.data/Makefile	(revision 10342)
@@ -6,11 +6,4 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/lib.data
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-#  
-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 10341)
+++ /trunk/Ohana/src/opihi/lib.shell/Makefile	(revision 10342)
@@ -6,11 +6,4 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/lib.shell
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-#  
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # opihi shell functions (libopihi) ########################
Index: /trunk/Ohana/src/opihi/mana/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/mana/Makefile	(revision 10341)
+++ /trunk/Ohana/src/opihi/mana/Makefile	(revision 10342)
@@ -6,18 +6,10 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/mana
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-DESTHLP =       $(HELPDIR)/mana
-
-#  compile flags
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
+HELP    =       $(DESTHELP)/mana
 
 # link flags 
 LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # mana user commands and support functions ########################
@@ -50,5 +42,5 @@
 install: $(DESTBIN)/mana help
 
-help: cmd.basic.help cmd.data.help cmd.astro.help mana.help
+help: clean-help cmd.basic.help cmd.data.help cmd.astro.help mana.help
 
 .PHONY: mana
Index: /trunk/Ohana/src/opihi/pantasks/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pantasks/Makefile	(revision 10341)
+++ /trunk/Ohana/src/opihi/pantasks/Makefile	(revision 10342)
@@ -6,18 +6,10 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/pantasks
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-DESTHLP =       $(HELPDIR)/pantasks
-
-#  compile flags
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
+HELP    =       $(DESTHELP)/pantasks
 
 # link flags 
 LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # sched user commands and support functions ########################
@@ -107,5 +99,5 @@
 install: $(DESTBIN)/pantasks $(DESTBIN)/pantasks_client $(DESTBIN)/pantasks_server help
 
-help: cmd.basic.help cmd.data.help cmd.astro.help pantasks.help
+help: clean-help cmd.basic.help cmd.data.help cmd.astro.help pantasks.help
 
 .PHONY: pantasks pantasks_client pantasks_server
Index: /trunk/Ohana/src/opihi/pclient/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pclient/Makefile	(revision 10341)
+++ /trunk/Ohana/src/opihi/pclient/Makefile	(revision 10342)
@@ -6,18 +6,10 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/pclient
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-DESTHLP =       $(HELPDIR)/pclient
-
-#  compile flags
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
+HELP    =       $(DESTHELP)/pclient
 
 # link flags 
 LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -lshell -ldata 
-LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # mana user commands and support functions ########################
Index: /trunk/Ohana/src/opihi/pcontrol/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 10341)
+++ /trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 10342)
@@ -6,18 +6,10 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/pcontrol
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-DESTHLP =       $(HELPDIR)/pcontrol
-
-#  compile flags
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
+HELP    =       $(DESTHELP)/pcontrol
 
 # link flags 
 LIBS1   =       -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -lshell -ldata 
-LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # to build the non-threaded version, remove -lpthread and comment out
Index: /trunk/Ohana/src/photdbc/Makefile
===================================================================
--- /trunk/Ohana/src/photdbc/Makefile	(revision 10341)
+++ /trunk/Ohana/src/photdbc/Makefile	(revision 10342)
@@ -1,22 +1,21 @@
+default: photdbc
+help:
+	@echo "make options: photdbc (default)"
+
 include ../../Configure
 HOME    =       $(ROOT)/src/photdbc
-CONFIG  =	$(ROOT)/config
-PROGRAM =       photdbc
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
 
-SRCLIST = \
+photdbc: $(BIN)/photdbc.$(ARCH)
+install: $(DESTBIN)/photdbc
+
+PHOTDBC = \
 $(SRC)/photdbc.$(ARCH).o	   \
 $(SRC)/initialize.$(ARCH).o	   \
@@ -49,35 +48,4 @@
 
 
-OBJ = $(SRCLIST)
-
-default: $(PROGRAM)
-
-$(SRCLIST): $(INC)/photdbc.h
-
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM)
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS)-c $< -o $@
+$(PHOTDBC): $(INC)/photdbc.h
+$(BIN)/photdbc.$(ARCH): $(PHOTDBC)
Index: /trunk/Ohana/src/relastro/Makefile
===================================================================
--- /trunk/Ohana/src/relastro/Makefile	(revision 10341)
+++ /trunk/Ohana/src/relastro/Makefile	(revision 10342)
@@ -1,23 +1,22 @@
+default: relastro
+help:
+	@echo "make options: relastro (default)"
+
 include ../../Configure
-HOME    =       $(ROOT)/src/relphot
-CONFIG  =	$(ROOT)/config
-PROGRAM =       relphot
-
+HOME    =       $(ROOT)/src/relastro
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
 
-RELPHOT = \
-$(SRC)/relphot.$(ARCH).o	 \
+relastro: $(BIN)/relastro.$(ARCH)
+install: $(DESTBIN)/relastro
+
+RELASTRO = \
+$(SRC)/relastro.$(ARCH).o	 \
 $(SRC)/initialize.$(ARCH).o	 \
 $(SRC)/ConfigInit.$(ARCH).o	 \
@@ -51,33 +50,4 @@
 $(SRC)/wcatalog.$(ARCH).o
 
-OBJ = $(RELPHOT)
-
-default: $(PROGRAM)
-
-$(RELPHOT): $(INC)/relphot.h
-
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM)
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(RELASTRO): $(INC)/relastro.h
+$(BIN)/relastro.$(ARCH): $(RELASTRO)
Index: /trunk/Ohana/src/relphot/Makefile
===================================================================
--- /trunk/Ohana/src/relphot/Makefile	(revision 10341)
+++ /trunk/Ohana/src/relphot/Makefile	(revision 10342)
@@ -1,20 +1,19 @@
+default: relphot
+help:
+	@echo "make options: relphot (default)"
+
 include ../../Configure
 HOME    =       $(ROOT)/src/relphot
-CONFIG  =	$(ROOT)/config
-PROGRAM =       relphot
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) -ldvo -lkapa -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-lkapa -ldvo -lFITS -lohana $(LDFLAGS)
+
+relphot: $(BIN)/relphot.$(ARCH)
+install: $(DESTBIN)/relphot
 
 RELPHOT = \
@@ -43,34 +42,4 @@
 $(SRC)/write_coords.$(ARCH).o
 
-OBJ = $(RELPHOT)
-
-default: $(PROGRAM)
-
 $(RELPHOT): $(INC)/relphot.h
-
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM)
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS)-c $< -o $@
+$(BIN)/relphot.$(ARCH): $(RELPHOT)
Index: /trunk/Ohana/src/skycalc/Makefile
===================================================================
--- /trunk/Ohana/src/skycalc/Makefile	(revision 10341)
+++ /trunk/Ohana/src/skycalc/Makefile	(revision 10342)
@@ -1,2 +1,6 @@
+default: skycalc
+help:
+	@echo "make options: (default)"
+
 include ../../Configure
 HOME	=	.
@@ -17,8 +21,5 @@
 CCFLAGS	=	$(INCS) $(LIBS)
 
-default: skycalc
-
 skycalc: $(DESTLIB)/libskycalc.a
-
 install: $(DESTINC)/skycalc.h $(DESTLIB)/libskycalc.a
 
Index: /trunk/Ohana/src/uniphot/Makefile
===================================================================
--- /trunk/Ohana/src/uniphot/Makefile	(revision 10341)
+++ /trunk/Ohana/src/uniphot/Makefile	(revision 10342)
@@ -1,20 +1,19 @@
+default: uniphot
+help:
+	@echo "make options: uniphot (default)"
+
 include ../../Configure
 HOME    =       $(ROOT)/src/uniphot
-CONFIG  =	$(ROOT)/config
-PROGRAM =       uniphot
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+
+uniphot: $(BIN)/uniphot.$(ARCH)
+install: $(DESTBIN)/uniphot
 
 UNIPHOT = \
@@ -35,34 +34,4 @@
 $(SRC)/sort.$(ARCH).o
 
-OBJ = $(UNIPHOT)
-
-default: $(PROGRAM)
-
 $(UNIPHOT): $(INC)/uniphot.h
-
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM)
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN)/uniphot.$(ARCH): $(UNIPHOT)