Changeset 39301 for trunk/Ohana/src/dvomerge/Makefile

Timestamp:

Jan 4, 2016, 1:12:14 PM (11 years ago)

Author:

eugene

Message:

changes to dvomerge to handle a cpt list restriction

File:

• trunk/Ohana/src/dvomerge/Makefile (modified) (7 diffs)

trunk/Ohana/src/dvomerge/Makefile

@@ -25 +25 @@
 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 +34 @@
 $(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 +43 @@
 $(SRC)/args.$(ARCH).o \
 $(SRC)/psps_ids.$(ARCH).o \
+$(SRC)/cptlist.$(ARCH).o \
 $(SRC)/SkyTablePopulatedRange.$(ARCH).o \
 $(SRC)/LoadCatalog.$(ARCH).o \
@@ -72 +69 @@
 $(SRC)/args.$(ARCH).o \
 $(SRC)/psps_ids.$(ARCH).o \
+$(SRC)/cptlist.$(ARCH).o \
 $(SRC)/SkyTablePopulatedRange.$(ARCH).o \
 $(SRC)/LoadCatalog.$(ARCH).o \
@@ -91 +89 @@
 $(SRC)/help.$(ARCH).o \
 $(SRC)/args.$(ARCH).o \
+$(SRC)/cptlist.$(ARCH).o \
 $(SRC)/SkyTablePopulatedRange.$(ARCH).o \
 $(SRC)/LoadCatalog.$(ARCH).o \
@@ -105 +104 @@
 $(SRC)/Shutdown.$(ARCH).o \
 $(SRC)/help.$(ARCH).o \
+$(SRC)/cptlist.$(ARCH).o \
 $(SRC)/args.$(ARCH).o
 
@@ -117 +117 @@
 $(SRC)/Shutdown.$(ARCH).o \
 $(SRC)/help.$(ARCH).o \
+$(SRC)/cptlist.$(ARCH).o \
 $(SRC)/args.$(ARCH).o