Index: /trunk/Ohana/src/kapa/Makefile
===================================================================
--- /trunk/Ohana/src/kapa/Makefile	(revision 5999)
+++ /trunk/Ohana/src/kapa/Makefile	(revision 6000)
@@ -21,9 +21,8 @@
 DESTMAN	=	$(LMAN)
 #
-INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-#LIBS	= 	-L$(LLIB) $(XLIB) -lFITS -lohana -lX11 -lm
-LIBS	= 	-L$(LLIB) $(XLIB) -lFITS -lkapa -lohana -lX11 -lsocket -lnsl -lpng -lz -lm
-CFLAGS  =	-o $*.$(ARCH).o $(INCS) 
-CCFLAGS	=	$(INCS) $(LIBS) 
+INCS	= 	-I$(LINC) -I$(XINC) -I$(INC) 
+LIBS	= 	-L$(LLIB) -L$(XLIB)
+CFLAGS  =	$(INCS) 
+LFLAGS	=	$(LIBS) -lFITS -lkapa -lohana -lX11 -lsocket -lnsl -lpng -lz -lm
 
 # local source / object files ########################
@@ -90,5 +89,5 @@
 $(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
+	$(CC) -o $@ $^ $(LFLAGS)
 
 install: $(DESTBIN)/$(PROGRAM)
@@ -112,6 +111,5 @@
 .SUFFIXES: .$(ARCH).o
 
-.c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $<
+%.$(ARCH).o : %.c
+	$(CC) -o $@ -c $< $(CFLAGS)
 
-
Index: /trunk/Ohana/src/kii/Makefile
===================================================================
--- /trunk/Ohana/src/kii/Makefile	(revision 5999)
+++ /trunk/Ohana/src/kii/Makefile	(revision 6000)
@@ -20,9 +20,8 @@
 DESTMAN	=	$(LMAN)
 #
-INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) $(XLIB) -ldvo -lFITS -lkapa -lohana -ljpeg -lX11 -lsocket -lnsl -lm
-# LIBS	= 	-L$(LLIB) $(XLIB) -lohana -lFITS -ljpeg -lX11 -lsocket -lnsl -lm -static
-CFLAGS  =	-o $*.$(ARCH).o $(INCS) 
-CCFLAGS	=	$(INCS) $(LIBS) 
+INCS	= 	-I$(LINC) -I$(XINC) -I$(INC) 
+LIBS	= 	-L$(LLIB) -L$(XLIB)
+CFLAGS  =	$(INCS) 
+LFLAGS	=	$(LIBS) -ldvo -lFITS -lkapa -lohana -ljpeg -lX11 -lsocket -lnsl -lm
 
 # local source / object files ########################
@@ -101,5 +100,5 @@
 $(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
+	$(CC) -o $@ $^ $(LFLAGS)
 
 install: $(DESTBIN)/$(PROGRAM)
@@ -123,6 +122,6 @@
 .SUFFIXES: .$(ARCH).o
 
-.c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $<
+%.$(ARCH).o : %.c
+	$(CC) -o $@ -c $< $(CFLAGS)
 
 
Index: /trunk/Ohana/src/opihi/Makefile.Common
===================================================================
--- /trunk/Ohana/src/opihi/Makefile.Common	(revision 5999)
+++ /trunk/Ohana/src/opihi/Makefile.Common	(revision 6000)
@@ -5,5 +5,5 @@
 $(BIN)/%.$(ARCH):
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $^ -o $@ $(LFLAGS) $(LIBS)
+	$(CC) -o $@ $^ $(LFLAGS)
 	@echo "compiled $*"
 	@echo ""
@@ -45,5 +45,5 @@
 
 %.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $*.c -o $@
+	$(CC) -o $@ -c $*.c $(CFLAGS)
 
 clean:
Index: /trunk/Ohana/src/opihi/dimm/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/dimm/Makefile	(revision 5999)
+++ /trunk/Ohana/src/opihi/dimm/Makefile	(revision 6000)
@@ -12,12 +12,14 @@
 DESTMAN =       $(LMAN)
 DESTHLP =       $(LHLP)/dimm
-#  
+
+#  compile flags
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ldvo -lFITS -lohana -lm
-LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata -lsbig
-LIBS    =       $(LIBS2) $(LIBS1) 
 CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
-CCFLAGS =       $(LIBS) 
+
+# link flags 
+LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
+LIBS1   =       -lsocket -lnsl -lreadline $(TLIBFLAG) -ldvo -lkapa -lFITS -lohana -lX11 -lm
+LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata -lsbig 
+LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
 
 # dimm user commands and support functions #####################
Index: /trunk/Ohana/src/opihi/dvo/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/dvo/Makefile	(revision 5999)
+++ /trunk/Ohana/src/opihi/dvo/Makefile	(revision 6000)
@@ -12,12 +12,14 @@
 DESTMAN =       $(LMAN)
 DESTHLP =       $(LHLP)/dvo
-#  
+
+#  compile flags
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ldvo -lkapa -lFITS -lohana -lX11 -lm
+CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+
+# link flags 
+LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
+LIBS1   =       -lsocket -lnsl -lreadline $(TLIBFLAG) -ldvo -lkapa -lFITS -lohana -lX11 -lm
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LIBS    =       $(LIBS2) $(LIBS1) 
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
-CCFLAGS =       $(LIBS) 
+LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
 
 # dvo user commands and support functions ########################
Index: /trunk/Ohana/src/opihi/mana/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/mana/Makefile	(revision 5999)
+++ /trunk/Ohana/src/opihi/mana/Makefile	(revision 6000)
@@ -12,12 +12,14 @@
 DESTMAN =       $(LMAN)
 DESTHLP =       $(LHLP)/mana
-#  
+
+#  compile flags
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ldvo -lkapa -lFITS -lohana -lX11 -lm
+CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+
+# link flags 
+LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
+LIBS1   =       -lsocket -lnsl -lreadline $(TLIBFLAG) -ldvo -lkapa -lFITS -lohana -lX11 -lm
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LIBS    =       $(LIBS2) $(LIBS1) 
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
-CCFLAGS =       $(LIBS) 
+LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
 
 # mana user commands and support functions ########################
Index: /trunk/Ohana/src/opihi/pantasks/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pantasks/Makefile	(revision 5999)
+++ /trunk/Ohana/src/opihi/pantasks/Makefile	(revision 6000)
@@ -12,12 +12,14 @@
 DESTMAN =       $(LMAN)
 DESTHLP =       $(LHLP)/psched
-#  
+
+#  compile flags
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ldvo -lkapa -lFITS -lohana -lX11 -lm
+CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+
+# link flags 
+LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
+LIBS1   =       -lsocket -lnsl -lreadline $(TLIBFLAG) -ldvo -lkapa -lFITS -lohana -lX11 -lm
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LIBS    =       $(LIBS2) $(LIBS1) 
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
-CCFLAGS =       $(LIBS) 
+LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
 
 # sched user commands and support functions ########################
Index: /trunk/Ohana/src/opihi/pclient/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pclient/Makefile	(revision 5999)
+++ /trunk/Ohana/src/opihi/pclient/Makefile	(revision 6000)
@@ -12,12 +12,14 @@
 DESTMAN =       $(LMAN)
 DESTHLP =       $(LHLP)/pclient
-#  
+
+#  compile flags
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -lkapa -lFITS -lohana -lX11 -lm
-LIBS2   =       -lbasiccmd -lshell -ldata
-LIBS    =       $(LIBS2) $(LIBS1) 
 CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
-CCFLAGS =       $(LIBS) 
+
+# link flags 
+LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
+LIBS1   =       -lsocket -lnsl -lreadline $(TLIBFLAG) -ldvo -lkapa -lFITS -lohana -lX11 -lm
+LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
+LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
 
 # mana user commands and support functions ########################
Index: /trunk/Ohana/src/opihi/pcontrol/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 5999)
+++ /trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 6000)
@@ -12,12 +12,14 @@
 DESTMAN =       $(LMAN)
 DESTHLP =       $(LHLP)/pcontrol
-#  
+
+#  compile flags
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -lkapa -lFITS -lohana -lX11 -lm
-LIBS2   =       -lbasiccmd -lshell -ldata
-LIBS    =       $(LIBS2) $(LIBS1) 
 CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
-CCFLAGS =       $(LIBS) 
+
+# link flags 
+LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
+LIBS1   =       -lsocket -lnsl -lreadline $(TLIBFLAG) -lkapa -lFITS -lohana -lX11 -lm
+LIBS2   =       -lbasiccmd -lshell -ldata 
+LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
 
 # mana user commands and support functions ########################
Index: /trunk/Ohana/src/relphot/Makefile
===================================================================
--- /trunk/Ohana/src/relphot/Makefile	(revision 5999)
+++ /trunk/Ohana/src/relphot/Makefile	(revision 6000)
@@ -15,5 +15,5 @@
 #
 INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lsocket -lnsl -ldvo -lFITS -lohana -lm 
+LIBS	= 	-L$(LLIB) -lsocket -lnsl -ldvo -lkapa -lFITS -lohana -lm 
 CFLAGS	=	-o $*.$(ARCH).o $(INCS)
 CCFLAGS	=	$(INCS) $(LIBS)