Index: trunk/Ohana/src/addstar/include/addstar.h
===================================================================
--- trunk/Ohana/src/addstar/include/addstar.h	(revision 5144)
+++ trunk/Ohana/src/addstar/include/addstar.h	(revision 5229)
@@ -102,4 +102,6 @@
 int REPLACE;
 int ONLY_MATCH;
+int CLOSEST;
+int REORDER;
 
 int MODE;
@@ -110,5 +112,5 @@
 
 /*** addstar prototypes ***/
-void       AddToCalibration       PROTO((Average *average, Measure *measure, Measure *new, int Nstar));
+void       AddToCalibration       PROTO((Average *average, Measure *measure, Measure *new, int *next, int Nstar));
 void       ConfigInit             PROTO((int *argc, char **argv));
 void       FindCalibration        PROTO((Image *image));
@@ -132,4 +134,5 @@
 int        edge_check             PROTO((double *x1, double *y1, double *x2, double *y2));
 void       find_matches           PROTO((GSCRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap));
+void       find_matches_closest   PROTO((GSCRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap));
 void       find_matches_refstars  PROTO((GSCRegion *region, Stars **stars, int Nstars, Catalog *catalog));
 Stars    **find_subset            PROTO((GSCRegion *region, Stars *stars, int Nstars, int *NSTARS));
@@ -182,4 +185,12 @@
 void       fsort2                 PROTO((float *X, float *Y, int N));
 
+int *init_measure_links (Average *average, int Naverage, Measure *measure, int Nmeasure);
+int *init_missing_links (Average *average, int Naverage, Missing *missing, int Nmissing);
+int add_meas_link (Average *average, int *next, int Nmeasure);
+int add_miss_link (Average *average, int *next, int Nmissing);
+int *build_measure_links (Average *average, int Naverage, Measure *measure, int Nmeasure);
+Measure *reorder_measure (Average *average, int Naverage, Measure *measure, int Nmeasure, int *next);
+Missing *reorder_missing (Average *average, int Naverage, Missing *missing, int Nmissing, int *next_miss);
+
 /** 
   there is an inconsistency to be resolved: fixed structures (like Image)