Index: trunk/Ohana/src/dvomerge/Makefile
===================================================================
--- trunk/Ohana/src/dvomerge/Makefile	(revision 39300)
+++ trunk/Ohana/src/dvomerge/Makefile	(revision 39301)
@@ -25,8 +25,5 @@
 dvoutils        : $(BIN)/dvoutils.$(ARCH)
 
-# all: dvomerge dvomerge_client dvoconvert dvosecfilt dvosecfilt_client dvorepair dvoverify dvoverify_client dvoutils
-all: dvoconvert dvosecfilt dvosecfilt_client dvorepair dvoverify dvoverify_client dvoutils
-
-#  $(SRC)/dvomergeContinue.$(ARCH).o
+all: dvomerge dvomerge_client dvoconvert dvosecfilt dvosecfilt_client dvorepair dvoverify dvoverify_client dvoutils
 
 DVOMERGE = \
@@ -37,5 +34,4 @@
 $(SRC)/dvomergeUpdate_threaded.$(ARCH).o \
 $(SRC)/dvomergeHistory.$(ARCH).o \
-$(SRC)/dvomergeFromList.$(ARCH).o \
 $(SRC)/dvomergeImageIDs.$(ARCH).o \
 $(SRC)/dvo_image_merge_dbs.$(ARCH).o \
@@ -47,4 +43,5 @@
 $(SRC)/args.$(ARCH).o \
 $(SRC)/psps_ids.$(ARCH).o \
+$(SRC)/cptlist.$(ARCH).o \
 $(SRC)/SkyTablePopulatedRange.$(ARCH).o \
 $(SRC)/LoadCatalog.$(ARCH).o \
@@ -72,4 +69,5 @@
 $(SRC)/args.$(ARCH).o \
 $(SRC)/psps_ids.$(ARCH).o \
+$(SRC)/cptlist.$(ARCH).o \
 $(SRC)/SkyTablePopulatedRange.$(ARCH).o \
 $(SRC)/LoadCatalog.$(ARCH).o \
@@ -91,4 +89,5 @@
 $(SRC)/help.$(ARCH).o \
 $(SRC)/args.$(ARCH).o \
+$(SRC)/cptlist.$(ARCH).o \
 $(SRC)/SkyTablePopulatedRange.$(ARCH).o \
 $(SRC)/LoadCatalog.$(ARCH).o \
@@ -105,4 +104,5 @@
 $(SRC)/Shutdown.$(ARCH).o \
 $(SRC)/help.$(ARCH).o \
+$(SRC)/cptlist.$(ARCH).o \
 $(SRC)/args.$(ARCH).o
 
@@ -117,4 +117,5 @@
 $(SRC)/Shutdown.$(ARCH).o \
 $(SRC)/help.$(ARCH).o \
+$(SRC)/cptlist.$(ARCH).o \
 $(SRC)/args.$(ARCH).o