Index: trunk/Ohana/src/opihi/cmd.astro/Makefile
===================================================================
--- trunk/Ohana/src/opihi/cmd.astro/Makefile	(revision 10073)
+++ trunk/Ohana/src/opihi/cmd.astro/Makefile	(revision 10305)
@@ -7,12 +7,10 @@
 SDIR    =       $(HOME)/cmd.astro
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-HELP    =       $(HOME)/help
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
 #  
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # astro user commands ########################
Index: trunk/Ohana/src/opihi/cmd.basic/Makefile
===================================================================
--- trunk/Ohana/src/opihi/cmd.basic/Makefile	(revision 10073)
+++ trunk/Ohana/src/opihi/cmd.basic/Makefile	(revision 10305)
@@ -7,12 +7,11 @@
 SDIR    =       $(HOME)/cmd.basic
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-HELP    =       $(HOME)/help
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+
 #  
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # basic user commands ########################
Index: trunk/Ohana/src/opihi/cmd.data/Makefile
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 10073)
+++ trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 10305)
@@ -7,12 +7,10 @@
 SDIR    =       $(HOME)/cmd.data
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-HELP    =       $(HOME)/help
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
 #  
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # data user commands ########################
@@ -30,4 +28,5 @@
 $(SDIR)/contour.$(ARCH).o	\
 $(SDIR)/create.$(ARCH).o	\
+$(SDIR)/cumulative.$(ARCH).o	\
 $(SDIR)/cursor.$(ARCH).o	\
 $(SDIR)/cut.$(ARCH).o		\
Index: trunk/Ohana/src/opihi/dimm/Makefile
===================================================================
--- trunk/Ohana/src/opihi/dimm/Makefile	(revision 10073)
+++ trunk/Ohana/src/opihi/dimm/Makefile	(revision 10305)
@@ -7,19 +7,17 @@
 SDIR    =       $(HOME)/dimm
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-DESTHLP =       $(LHLP)/dimm
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+DESTHLP =       $(HELPDIR)/dimm
 
 #  compile flags
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
 
 # link flags 
-LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
-LIBS1   =       -lsocket -lnsl -lreadline $(TLIB) -ljpeg -ldvo -lkapa -lFITS -lohana -lX11 -lm
+LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata -lsbig 
-LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # dimm user commands and support functions #####################
@@ -47,7 +45,7 @@
 $(DESTLIB)/libsbig.a
 
-dimm: sbig $(BIN)/dimm.$(ARCH)
+dimm: sbig $(BIN)/dimm.$(ARCH) $(libs)
 
-$(BIN)/dimm.$(ARCH) : $(funcs) $(cmds) $(libs)
+$(BIN)/dimm.$(ARCH) : $(funcs) $(cmds)
 
 install: $(DESTBIN)/dimm help
Index: trunk/Ohana/src/opihi/dvo/Makefile
===================================================================
--- trunk/Ohana/src/opihi/dvo/Makefile	(revision 10073)
+++ trunk/Ohana/src/opihi/dvo/Makefile	(revision 10305)
@@ -7,19 +7,17 @@
 SDIR    =       $(HOME)/dvo
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-DESTHLP =       $(LHLP)/dvo
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+DESTHLP =       $(HELPDIR)/dvo
 
 #  compile flags
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
 
 # link flags 
-LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
-LIBS1   =       -lsocket -lnsl -lreadline $(TLIB) -ljpeg -ldvo -lkapa -lFITS -lohana -lX11 -lm
+LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # dvo user commands and support functions ########################
@@ -92,7 +90,7 @@
 $(DESTLIB)/libdatacmd.a
 
-dvo: $(BIN)/dvo.$(ARCH)
+dvo: $(BIN)/dvo.$(ARCH) $(libs)
 
-$(BIN)/dvo.$(ARCH) : $(funcs) $(cmds) $(libs)
+$(BIN)/dvo.$(ARCH) : $(funcs) $(cmds)
 
 install: $(DESTBIN)/dvo help
Index: trunk/Ohana/src/opihi/lib.data/Makefile
===================================================================
--- trunk/Ohana/src/opihi/lib.data/Makefile	(revision 10073)
+++ trunk/Ohana/src/opihi/lib.data/Makefile	(revision 10305)
@@ -7,12 +7,10 @@
 SDIR    =       $(HOME)/lib.data
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-HELP    =       $(HOME)/help
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
 #  
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # general numerical functions (libdata) #####################
Index: trunk/Ohana/src/opihi/lib.shell/Makefile
===================================================================
--- trunk/Ohana/src/opihi/lib.shell/Makefile	(revision 10073)
+++ trunk/Ohana/src/opihi/lib.shell/Makefile	(revision 10305)
@@ -7,12 +7,10 @@
 SDIR    =       $(HOME)/lib.shell
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-HELP    =       $(HOME)/help
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
 #  
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # opihi shell functions (libopihi) ########################
Index: trunk/Ohana/src/opihi/mana/Makefile
===================================================================
--- trunk/Ohana/src/opihi/mana/Makefile	(revision 10073)
+++ trunk/Ohana/src/opihi/mana/Makefile	(revision 10305)
@@ -7,20 +7,17 @@
 SDIR    =       $(HOME)/mana
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-DESTHLP =       $(LHLP)/mana
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+DESTHLP =       $(HELPDIR)/mana
 
 #  compile flags
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
 
 # link flags 
-LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
-LIBS1   =       -lsocket -lnsl -lreadline $(TLIB) -ljpeg -ldvo -lkapa -lFITS -lohana -lX11 -lpthread -lm
-# LIBS1   =       -lreadline $(TLIB) -ldvo -lkapa -lFITS -lohana -lX11 -lm
+LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # mana user commands and support functions ########################
@@ -47,7 +44,7 @@
 $(DESTLIB)/libdatacmd.a
 
-mana: $(BIN)/mana.$(ARCH)
+mana: $(BIN)/mana.$(ARCH) $(libs)
 
-$(BIN)/mana.$(ARCH) : $(mana) $(libs)
+$(BIN)/mana.$(ARCH) : $(mana)
 
 install: $(DESTBIN)/mana help
Index: trunk/Ohana/src/opihi/pantasks/Makefile
===================================================================
--- trunk/Ohana/src/opihi/pantasks/Makefile	(revision 10073)
+++ trunk/Ohana/src/opihi/pantasks/Makefile	(revision 10305)
@@ -7,19 +7,17 @@
 SDIR    =       $(HOME)/pantasks
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-DESTHLP =       $(LHLP)/pantasks
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+DESTHLP =       $(HELPDIR)/pantasks
 
 #  compile flags
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
 
 # link flags 
-LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
-LIBS1   =       -lsocket -lnsl -lreadline $(TLIB) -ljpeg -ldvo -lkapa -lFITS -lohana -lX11 -lpthread -lm
+LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # sched user commands and support functions ########################
@@ -93,12 +91,12 @@
 $(DESTLIB)/libdatacmd.a
 
-pantasks: $(BIN)/pantasks.$(ARCH)
-$(BIN)/pantasks.$(ARCH) : $(single) $(funcs) $(cmds) $(libs)
+pantasks: $(BIN)/pantasks.$(ARCH) $(libs)
+$(BIN)/pantasks.$(ARCH) : $(single) $(funcs) $(cmds)
 
-pantasks_client: $(BIN)/pantasks_client.$(ARCH)
-$(BIN)/pantasks_client.$(ARCH) : $(client) $(libs)
+pantasks_client: $(BIN)/pantasks_client.$(ARCH) $(libs)
+$(BIN)/pantasks_client.$(ARCH) : $(client)
 
-pantasks_server: $(BIN)/pantasks_server.$(ARCH)
-$(BIN)/pantasks_server.$(ARCH) : $(server) $(funcs) $(cmds) $(libs)
+pantasks_server: $(BIN)/pantasks_server.$(ARCH) $(libs)
+$(BIN)/pantasks_server.$(ARCH) : $(server) $(funcs) $(cmds)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
 	$(CC) -o $@ $^ $(LFLAGS)
Index: trunk/Ohana/src/opihi/pclient/Makefile
===================================================================
--- trunk/Ohana/src/opihi/pclient/Makefile	(revision 10073)
+++ trunk/Ohana/src/opihi/pclient/Makefile	(revision 10305)
@@ -7,19 +7,17 @@
 SDIR    =       $(HOME)/pclient
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-DESTHLP =       $(LHLP)/pclient
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+DESTHLP =       $(HELPDIR)/pclient
 
 #  compile flags
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
 
 # link flags 
-LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
-LIBS1   =       -lsocket -lnsl -lreadline $(TLIB) -ldvo -lkapa -lFITS -lohana -lX11 -lm
+LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -lshell -ldata 
-LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # mana user commands and support functions ########################
@@ -43,7 +41,7 @@
 $(DESTLIB)/libdata.a
 
-pclient: $(BIN)/pclient.$(ARCH)
+pclient: $(BIN)/pclient.$(ARCH) $(libs)
 
-$(BIN)/pclient.$(ARCH) : $(funcs) $(cmds) $(libs)
+$(BIN)/pclient.$(ARCH) : $(funcs) $(cmds)
 
 install: $(DESTBIN)/pclient help
Index: trunk/Ohana/src/opihi/pcontrol/Makefile
===================================================================
--- trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 10073)
+++ trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 10305)
@@ -7,19 +7,17 @@
 SDIR    =       $(HOME)/pcontrol
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-DESTHLP =       $(LHLP)/pcontrol
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+DESTHLP =       $(HELPDIR)/pcontrol
 
 #  compile flags
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
 
 # link flags 
-LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
-LIBS1   =       -lsocket -lnsl -lreadline $(TLIB) -lkapa -lFITS -lohana -lX11 -lpthread -lm
+LIBS1   =       -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -lshell -ldata 
-LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # to build the non-threaded version, remove -lpthread and comment out
@@ -74,7 +72,7 @@
 $(DESTLIB)/libdata.a
 
-pcontrol: $(BIN)/pcontrol.$(ARCH)
+pcontrol: $(BIN)/pcontrol.$(ARCH) $(libs)
 
-$(BIN)/pcontrol.$(ARCH) : $(pcontrol) $(libs)
+$(BIN)/pcontrol.$(ARCH) : $(pcontrol)
 
 install: $(DESTBIN)/pcontrol help