Changeset 27838 for branches/tap_branches/Ohana/src/dvomerge/Makefile

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/dvomerge/Makefile (modified) (3 diffs)

branches/tap_branches/Ohana/src/dvomerge/Makefile

@@ -1 @@
-default: dvomerge
+default: all
 help:
         @echo "make options: dvomerge (default)"
@@ -18 +18 @@
 
 dvomerge     : $(BIN)/dvomerge.$(ARCH)
-all: dvomerge
+dvomerge     : $(BIN)/dvoconvert.$(ARCH)
+
+all: dvomerge dvoconvert
 
 DVOMERGE = \
 $(SRC)/dvomerge.$(ARCH).o \
+$(SRC)/dvomergeUpdate.$(ARCH).o \
+$(SRC)/dvomergeCreate.$(ARCH).o \
+$(SRC)/dvo_image_merge_dbs.$(ARCH).o \
 $(SRC)/SetSignals.$(ARCH).o \
 $(SRC)/ConfigInit.$(ARCH).o \
 $(SRC)/Shutdown.$(ARCH).o \
-$(SRC)/usage.$(ARCH).o \
+$(SRC)/help.$(ARCH).o \
+$(SRC)/args.$(ARCH).o \
+$(SRC)/psps_ids.$(ARCH).o \
 $(SRC)/SkyTablePopulatedRange.$(ARCH).o \
 $(SRC)/LoadCatalog.$(ARCH).o \
@@ -36 +43 @@
 $(BIN)/dvomerge.$(ARCH) : $(DVOMERGE)
 
-INSTALL = dvomerge
+DVOCONVERT = \
+$(SRC)/dvoconvert.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/help.$(ARCH).o \
+$(SRC)/args.$(ARCH).o \
+$(SRC)/SkyTablePopulatedRange.$(ARCH).o \
+$(SRC)/LoadCatalog.$(ARCH).o \
+$(SRC)/merge_catalogs_new.$(ARCH).o
+
+$(DVOCONVERT)  : $(INC)/dvomerge.h
+
+$(BIN)/dvoconvert.$(ARCH) : $(DVOCONVERT)
+
+INSTALL = dvomerge dvoconvert
 
 # dependancy rules for binary code #########################