Index: trunk/Ohana/src/opihi/dvo/Makefile
===================================================================
--- trunk/Ohana/src/opihi/dvo/Makefile	(revision 4701)
+++ trunk/Ohana/src/opihi/dvo/Makefile	(revision 4747)
@@ -1,5 +1,3 @@
 include ../../../Configure
-
-default: all
 
 HOME    =       $(ROOT)/src/opihi
@@ -25,5 +23,5 @@
 # dvo user commands and support functions ########################
 
-dvofuncs = \
+funcs = \
 $(SDIR)/init.$(ARCH).o            	\
 $(SDIR)/ImageOps.$(ARCH).o		\
@@ -40,5 +38,5 @@
 $(SDIR)/dvo.$(ARCH).o
 
-dvocmds = \
+cmds = \
 $(SDIR)/avextract.$(ARCH).o	  	\
 $(SDIR)/badimages.$(ARCH).o	  	\
@@ -85,6 +83,4 @@
 $(SDIR)/subpix.$(ARCH).o 		
 
-dvo = $(dvofuncs) $(dvocmds)
-
 libs = \
 $(DESTLIB)/libshell.a \
@@ -94,10 +90,7 @@
 $(DESTLIB)/libdatacmd.a
 
-all: dvo
+dvo: $(BIN)/dvo.$(ARCH)
 
-dvo: $(BIN)/dvo.$(ARCH)
-	@echo done
-
-$(BIN)/dvo.$(ARCH) : $(dvo) $(libs)
+$(BIN)/dvo.$(ARCH) : $(funcs) $(cmds) $(libs)
 
 install: $(DESTBIN)/dvo help
@@ -105,62 +98,8 @@
 help: cmd.basic.help cmd.data.help cmd.astro.help dvo.help
 
-# utilities #################################################
-$(BIN)/%.$(ARCH):
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $^ -o $@ $(LFLAGS) $(LIBS)
-	@echo "compiled $*"
-	@echo ""
+.PHONY: dvo
 
-$(DESTBIN)/%: $(BIN)/%.$(ARCH) 
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$*
-	cp $(BIN)/$*.$(ARCH) $(DESTBIN)/$*
-	@echo "installed $*"
-	@echo ""
+include ../Makefile.Common
 
-$(LIB)/%.$(ARCH).a:
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $@
-	ar rcv $@ $^ 
-	$(RANLIB) $@
-	@echo "compiled library $*"
-	@echo ""
-
-$(DESTLIB)/%.a: $(LIB)/%.$(ARCH).a
-	@if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
-	@echo ""
-	rm -f $@
-	cp $^ $@
-
-clean:
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f $(LIB)/*.$(ARCH).a
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-dist: clean
-	rm -f $(BIN)/*
-	rm -f $(LIB)/*
-
-lib%.clean:
-	rm -f $(LIB)/lib$*.$(ARCH).a
-	rm -f $($*)
-	@echo ""
-
-%.clean:
-	rm -f $(BIN)/$*.$(ARCH)
-	@echo ""
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $*.c -o $@
-
-%.help:
-	@if [ ! -d $(DESTHLP) ]; then mkdir -p $(DESTHLP); fi
-	rm -f $(HOME)/$*/help/*~
-	rm -f $(HOME)/$*/help/#*
-	for i in `find $(HOME)/$*/help -type f -maxdepth 1`; do cp -f $$i $(DESTHLP); done
-
-## -*- makefile -*- 
 # deprecated functions: verify & delete
 #$(SDIR)/abszero.$(ARCH).o \