Index: trunk/Ohana/src/imregister/Makefile
===================================================================
--- trunk/Ohana/src/imregister/Makefile	(revision 10305)
+++ trunk/Ohana/src/imregister/Makefile	(revision 10509)
@@ -1,16 +1,14 @@
+default: all
+help:
+	@echo "make options: all imregister etc (default)"
+
 include ../../Configure
 HOME    =       $(ROOT)/src/imregister
-
-default: all
-
 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
 
 BASEDIR =	$(HOME)/base
@@ -21,6 +19,5 @@
 SPREG   =	$(HOME)/spreg
 
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
 
 # programs which should be installed
@@ -115,53 +112,50 @@
 all: $(INSTALL) $(DEVEL)
 
-IR = $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
-IS = $(IMREG)/args.imsearch.$(ARCH).o      $(IMOBJ)   $(BASEOBJ)
-DR = $(DETREND)/args.detregister.$(ARCH).o $(DETOBJ)  $(BASEOBJ)
-DS = $(DETREND)/args.detsearch.$(ARCH).o   $(DETOBJ)  $(BASEOBJ)
-PS = $(PHOTREG)/args.photsearch.$(ARCH).o  $(PHOTOBJ) $(BASEOBJ)
-PR = $(PHOTREG)/args.photreg.$(ARCH).o     $(PHOTOBJ) $(BASEOBJ)
-SR = $(SPREG)/args.spregister.$(ARCH).o    $(SPOBJ)   $(BASEOBJ)
-SS = $(SPREG)/args.spsearch.$(ARCH).o      $(SPOBJ)   $(BASEOBJ)
-IP = $(IMPHOTOBJ) $(BASEOBJ)
+$(INSTALL) $(DEVEL) : % : $(BIN)/%.$(ARCH)
 
-$(SR) : $(INC)/spreg.h $(INC)/imregister.h
-$(SS) : $(INC)/spreg.h $(INC)/imregister.h
+IR1 = $(SRC)/imsearch.$(ARCH).o     $(IMREG)/args.imsearch.$(ARCH).o      $(IMOBJ)   $(BASEOBJ)
+IR2 = $(SRC)/imregister.$(ARCH).o   $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+IR3 = $(SRC)/imregister.$(ARCH).o   $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+IR4 = $(SRC)/imregister.$(ARCH).o   $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+IR5 = $(SRC)/imregister.$(ARCH).o   $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+IR6 = $(SRC)/imregister.$(ARCH).o   $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+SR1 = $(SRC)/spregister.$(ARCH).o   $(SPREG)/args.spregister.$(ARCH).o    $(SPOBJ)   $(BASEOBJ)
+SR2 = $(SRC)/spsearch.$(ARCH).o     $(SPREG)/args.spsearch.$(ARCH).o      $(SPOBJ)   $(BASEOBJ)
+DR1 = $(SRC)/detregister.$(ARCH).o  $(DETREND)/args.detregister.$(ARCH).o $(DETOBJ)  $(BASEOBJ)
+DR2 = $(SRC)/detsearch.$(ARCH).o    $(DETREND)/args.detsearch.$(ARCH).o   $(DETOBJ)  $(BASEOBJ)
+PR1 = $(SRC)/photreg.$(ARCH).o      $(PHOTREG)/args.photreg.$(ARCH).o     $(PHOTOBJ) $(BASEOBJ)
+PR2 = $(SRC)/photsearch.$(ARCH).o   $(PHOTREG)/args.photsearch.$(ARCH).o  $(PHOTOBJ) $(BASEOBJ)
+
+$(IR1) : $(INC)/imreg.h $(INC)/imregister.h
+$(IR2) : $(INC)/imreg.h $(INC)/imregister.h
+$(IR3) : $(INC)/imreg.h $(INC)/imregister.h
+$(IR4) : $(INC)/imreg.h $(INC)/imregister.h
+$(IR5) : $(INC)/imreg.h $(INC)/imregister.h
+$(IR6) : $(INC)/imreg.h $(INC)/imregister.h
+$(SR1) : $(INC)/spreg.h $(INC)/imregister.h
+$(SR2) : $(INC)/spreg.h $(INC)/imregister.h
+$(DR1) : $(INC)/detrend.h $(INC)/imregister.h
+$(DR2) : $(INC)/detrend.h $(INC)/imregister.h
+$(PR1) : $(INC)/photreg.h $(INC)/imregister.h
+$(PR2) : $(INC)/photreg.h $(INC)/imregister.h
 
 # special rules:
-$(BIN)/photreg.$(ARCH)      : $(SRC)/photreg.$(ARCH).o      $(PR) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/photsearch.$(ARCH)   : $(SRC)/photsearch.$(ARCH).o   $(PS) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/imsearch.$(ARCH)     : $(SRC)/imsearch.$(ARCH).o     $(IS) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/imregister.$(ARCH)   : $(SRC)/imregister.$(ARCH).o   $(IR) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/imstatreg.$(ARCH)    : $(SRC)/imstatreg.$(ARCH).o    $(IR) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/showiminfo.$(ARCH)   : $(SRC)/showiminfo.$(ARCH).o   $(IR) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/imregtable.$(ARCH)   : $(SRC)/imregtable.$(ARCH).o   $(IR) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/convertimreg.$(ARCH) : $(SRC)/convertimreg.$(ARCH).o $(IR) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/detregister.$(ARCH)  : $(SRC)/detregister.$(ARCH).o  $(DR) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/detsearch.$(ARCH)    : $(SRC)/detsearch.$(ARCH).o    $(DS) ; $(CC) $^ -o $@ $(LFLAGS)
+$(BIN)/imsearch.$(ARCH)     : $(IR1)
+$(BIN)/imregister.$(ARCH)   : $(IR2)
+$(BIN)/imstatreg.$(ARCH)    : $(IR3)
+$(BIN)/showiminfo.$(ARCH)   : $(IR4)
+$(BIN)/imregtable.$(ARCH)   : $(IR5)
+$(BIN)/convertimreg.$(ARCH) : $(IR6)
+$(BIN)/detregister.$(ARCH)  : $(DR1)
+$(BIN)/detsearch.$(ARCH)    : $(DR2)
+$(BIN)/photreg.$(ARCH)      : $(PR1)
+$(BIN)/photsearch.$(ARCH)   : $(PR2)
+$(BIN)/spregister.$(ARCH)   : $(SR1)
+$(BIN)/spsearch.$(ARCH)     : $(SR2)
 
-$(BIN)/imsort.$(ARCH)       : $(BIN)/imregister.$(ARCH) ; rm -f $(BIN)/imsort.$(ARCH) ; cp $(BIN)/imregister.$(ARCH) $(BIN)/imsort.$(ARCH) 
+#$(BIN)/imphotsearch.$(ARCH) : $(SRC)/imphotsearch.$(ARCH).o $(IP) ; $(CC) $^ -o $@ $(LFLAGS)
+#$(BIN)/imsort.$(ARCH)       : $(BIN)/imregister.$(ARCH) ; rm -f $(BIN)/imsort.$(ARCH) ; cp $(BIN)/imregister.$(ARCH) $(BIN)/imsort.$(ARCH) 
 
-$(BIN)/spsearch.$(ARCH)     : $(SRC)/spsearch.$(ARCH).o     $(SS) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/spregister.$(ARCH)   : $(SRC)/spregister.$(ARCH).o   $(SR) ; $(CC) $^ -o $@ $(LFLAGS)
-
-$(BIN)/imphotsearch.$(ARCH) : $(SRC)/imphotsearch.$(ARCH).o $(IP) ; $(CC) $^ -o $@ $(LFLAGS)
-
-# dependancy rules for binary code #########################
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o $(BASEOBJ)
-	@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)
+# utilities #################################################
 
 %.clean :
@@ -175,10 +169,4 @@
 	make $(DESTBIN)/$*
 
-# utilities #################################################
-
 install:
 	for i in $(INSTALL); do make $$i.install || exit; done
-
-clean:
-	rm -f */*.o
-	rm -f */*~