Index: trunk/Ohana/src/opihi/mana/Makefile
===================================================================
--- trunk/Ohana/src/opihi/mana/Makefile	(revision 10509)
+++ trunk/Ohana/src/opihi/mana/Makefile	(revision 11054)
@@ -1,9 +1,10 @@
 include ../../../Configure
+default: mana
 
 HOME    =       $(ROOT)/src/opihi
+SRC     =       $(HOME)/mana
 BIN     =       $(HOME)/bin
 LIB     =       $(HOME)/lib
 INC     =       $(HOME)/include
-SDIR    =       $(HOME)/mana
 HELP    =       $(DESTHELP)/mana
 
@@ -15,17 +16,15 @@
 # mana user commands and support functions ########################
 
-manafuncs = \
-$(SDIR)/init.$(ARCH).o \
-$(SDIR)/mana.$(ARCH).o \
-$(SDIR)/findrowpeaks.$(ARCH).o 
+funcs = \
+$(SRC)/init.$(ARCH).o \
+$(SRC)/mana.$(ARCH).o \
+$(SRC)/findrowpeaks.$(ARCH).o 
 
-manacmds = \
-$(SDIR)/rawstars.$(ARCH).o \
-$(SDIR)/fitcontour.$(ARCH).o \
-$(SDIR)/starcontour.$(ARCH).o \
-$(SDIR)/version.$(ARCH).o \
-$(SDIR)/findpeaks.$(ARCH).o 
-
-mana = $(manacmds) $(manafuncs)
+cmds = \
+$(SRC)/rawstars.$(ARCH).o \
+$(SRC)/fitcontour.$(ARCH).o \
+$(SRC)/starcontour.$(ARCH).o \
+$(SRC)/version.$(ARCH).o \
+$(SRC)/findpeaks.$(ARCH).o 
 
 libs = \
@@ -36,12 +35,7 @@
 $(DESTLIB)/libdatacmd.a
 
-mana: $(BIN)/mana.$(ARCH) 
-
-### fix this: this is adding libdatacmd.a, etc, to the compile line
-### (because $(libs) is a dep and included by the Makefile.Common rul
-### (BUT without this line, mana does not get compiled if changes happen
-### to libdatacmd.a 
-$(BIN)/mana.$(ARCH) : $(libs)
-$(BIN)/mana.$(ARCH) : $(mana)
+mana: $(BIN)/mana.$(ARCH)
+$(SRC)/mana.$(ARCH).o : $(libs)
+$(BIN)/mana.$(ARCH)   : $(cmds) $(funcs)
 
 install: $(DESTBIN)/mana help