Index: /trunk/Ohana/src/imregister/Makefile
===================================================================
--- /trunk/Ohana/src/imregister/Makefile	(revision 10558)
+++ /trunk/Ohana/src/imregister/Makefile	(revision 10559)
@@ -23,12 +23,12 @@
 # programs which should be installed
 INSTALL = \
-detregister  detsearch    \
 imregister   imstatreg    \
 imsort       imsearch     \
 showiminfo   convertimreg \
-imregtable   photcode	  \
+detregister  detsearch    \
 photsearch   photreg      \
+imregtable   imphotsearch \
 cameraconfig filtnames    \
-imphotsearch 
+photcode
 
 # program under development, not installed
@@ -44,4 +44,8 @@
 $(IMPHOT)/rtext.$(ARCH).o \
 $(IMPHOT)/subset.$(ARCH).o
+
+$(SRC)/imphotsearch.$(ARCH).o \
+$(SRC)/imphotmerge.$(ARCH).o \
+$(IMPHOTOBJ): $(INC)/imphot.h $(INC)/imregister.h
 
 IMOBJ  = \
@@ -64,4 +68,14 @@
 $(IMREG)/imregclient.$(ARCH).o
 
+$(SRC)/imsearch.$(ARCH).o \
+$(SRC)/imregister.$(ARCH).o \
+$(SRC)/imstatreg.$(ARCH).o \
+$(SRC)/showiminfo.$(ARCH).o \
+$(SRC)/imregtable.$(ARCH).o \
+$(SRC)/convertimreg.$(ARCH).o \
+$(IMREG)/args.imsearch.$(ARCH).o \
+$(IMREG)/args.imregister.$(ARCH).o \
+$(IMOBJ): $(INC)/imreg.h $(INC)/imregister.h
+
 SPOBJ  = \
 $(SPREG)/delete.$(ARCH).o   \
@@ -74,4 +88,10 @@
 $(SPREG)/ConfigInit.$(ARCH).o
 
+$(SRC)/spregister.$(ARCH).o \
+$(SPREG)/args.spregister.$(ARCH).o \
+$(SRC)/spsearch.$(ARCH).o \
+$(SPREG)/args.spsearch.$(ARCH).o \
+$(SPOBJ): $(INC)/spreg.h $(INC)/imregister.h
+
 PHOTOBJ  = \
 $(PHOTREG)/delete.$(ARCH).o  \
@@ -80,4 +100,10 @@
 $(PHOTREG)/output.$(ARCH).o  \
 $(PHOTREG)/getImageData.$(ARCH).o
+
+$(SRC)/photreg.$(ARCH).o \
+$(SRC)/photsearch.$(ARCH).o \
+$(PHOTREG)/args.photreg.$(ARCH).o \
+$(PHOTREG)/args.photsearch.$(ARCH).o \
+$(PHOTOBJ): $(INC)/photreg.h $(INC)/imregister.h
 
 DETOBJ  = \
@@ -98,4 +124,10 @@
 $(DETREND)/usage.$(ARCH).o
 
+$(SRC)/detregister.$(ARCH).o  \
+$(SRC)/detsearch.$(ARCH).o \
+$(DETREND)/args.detregister.$(ARCH).o \
+$(DETREND)/args.detsearch.$(ARCH).o \
+$(DETOBJ): $(INC)/detrend.h $(INC)/imregister.h
+
 BASEOBJ = \
 $(BASEDIR)/ConfigCamera.$(ARCH).o \
@@ -110,50 +142,35 @@
 $(BASEDIR)/sort.$(ARCH).o
 
+$(SRC)/photcode.$(ARCH).o \
+$(SRC)/cameraconfig.$(ARCH).o \
+$(SRC)/filtnames.$(ARCH).o \
+$(BASEOBJ): $(INC)/imregister.h
+
+# specific programs:
+$(BIN)/imsearch.$(ARCH)     : $(SRC)/imsearch.$(ARCH).o     $(IMREG)/args.imsearch.$(ARCH).o      $(IMOBJ)   $(BASEOBJ)
+$(BIN)/imregister.$(ARCH)   : $(SRC)/imregister.$(ARCH).o   $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+$(BIN)/imstatreg.$(ARCH)    : $(SRC)/imstatreg.$(ARCH).o    $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+$(BIN)/showiminfo.$(ARCH)   : $(SRC)/showiminfo.$(ARCH).o   $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+$(BIN)/imregtable.$(ARCH)   : $(SRC)/imregtable.$(ARCH).o   $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+$(BIN)/convertimreg.$(ARCH) : $(SRC)/convertimreg.$(ARCH).o $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+$(BIN)/detregister.$(ARCH)  : $(SRC)/detregister.$(ARCH).o  $(DETREND)/args.detregister.$(ARCH).o $(DETOBJ)  $(BASEOBJ)
+$(BIN)/detsearch.$(ARCH)    : $(SRC)/detsearch.$(ARCH).o    $(DETREND)/args.detsearch.$(ARCH).o   $(DETOBJ)  $(BASEOBJ)
+$(BIN)/photreg.$(ARCH)      : $(SRC)/photreg.$(ARCH).o      $(PHOTREG)/args.photreg.$(ARCH).o     $(PHOTOBJ) $(BASEOBJ)
+$(BIN)/photsearch.$(ARCH)   : $(SRC)/photsearch.$(ARCH).o   $(PHOTREG)/args.photsearch.$(ARCH).o  $(PHOTOBJ) $(BASEOBJ)
+$(BIN)/spregister.$(ARCH)   : $(SRC)/spregister.$(ARCH).o   $(SPREG)/args.spregister.$(ARCH).o    $(SPOBJ)   $(BASEOBJ)
+$(BIN)/spsearch.$(ARCH)     : $(SRC)/spsearch.$(ARCH).o     $(SPREG)/args.spsearch.$(ARCH).o      $(SPOBJ)   $(BASEOBJ)
+$(BIN)/imphotsearch.$(ARCH) : $(SRC)/imphotsearch.$(ARCH).o $(IMPHOTOBJ) $(BASEOBJ)
+$(BIN)/imphotmerge.$(ARCH)  : $(SRC)/imphotmerge.$(ARCH).o  $(IMPHOTOBJ) $(BASEOBJ)
+$(BIN)/cameraconfig.$(ARCH) : $(SRC)/cameraconfig.$(ARCH).o $(BASEOBJ)
+$(BIN)/filtnames.$(ARCH)    : $(SRC)/filtnames.$(ARCH).o    $(BASEOBJ)
+$(BIN)/photcode.$(ARCH)     : $(SRC)/photcode.$(ARCH).o     $(BASEOBJ)
+
+$(BIN)/imsort.$(ARCH): $(BIN)/imregister.$(ARCH)
+	rm -f  $(BIN)/imsort.$(ARCH)
+	cp $(BIN)/imregister.$(ARCH) $(BIN)/imsort.$(ARCH)
+
 all: $(INSTALL) $(DEVEL)
 
 $(INSTALL) $(DEVEL) : % : $(BIN)/%.$(ARCH)
-
-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)/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)/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) 
 
 # utilities #################################################