Index: /trunk/Ohana/src/opihi/cmd.astro/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/cmd.astro/Makefile	(revision 5942)
+++ /trunk/Ohana/src/opihi/cmd.astro/Makefile	(revision 5943)
@@ -14,8 +14,5 @@
 #  
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lFITS -lohana -lm
 CFLAGS  =       $(INCS)
-CCFLAGS =       $(LIBS) 
 
 # astro user commands ########################
Index: /trunk/Ohana/src/opihi/cmd.basic/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/cmd.basic/Makefile	(revision 5942)
+++ /trunk/Ohana/src/opihi/cmd.basic/Makefile	(revision 5943)
@@ -14,8 +14,5 @@
 #  
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lFITS -lohana -lm
 CFLAGS  =       $(INCS)
-CCFLAGS =       $(LIBS) 
 
 # basic user commands ########################
Index: /trunk/Ohana/src/opihi/cmd.data/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 5942)
+++ /trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 5943)
@@ -14,8 +14,5 @@
 #  
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lFITS -lohana -lm
 CFLAGS  =       $(INCS)
-CCFLAGS =       $(LIBS) 
 
 # data user commands ########################
Index: /trunk/Ohana/src/opihi/dimm/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/dimm/Makefile	(revision 5942)
+++ /trunk/Ohana/src/opihi/dimm/Makefile	(revision 5943)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -ldvo -lFITS -lohana -lm
+LIBS1   =       -lsocket -lnsl -lreadline -ldvo -lFITS -lohana -lm
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata -lsbig
 LIBS    =       $(LIBS2) $(LIBS1) 
Index: /trunk/Ohana/src/opihi/dvo/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/dvo/Makefile	(revision 5942)
+++ /trunk/Ohana/src/opihi/dvo/Makefile	(revision 5943)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -ldvo -lkapa -lFITS -lohana -lX11 -lm
+LIBS1   =       -lsocket -lnsl -lreadline -ldvo -lkapa -lFITS -lohana -lX11 -lm
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
 LIBS    =       $(LIBS2) $(LIBS1) 
Index: /trunk/Ohana/src/opihi/lib.data/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/lib.data/Makefile	(revision 5942)
+++ /trunk/Ohana/src/opihi/lib.data/Makefile	(revision 5943)
@@ -14,8 +14,5 @@
 #  
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lFITS -lohana -lm
 CFLAGS  =       $(INCS)
-CCFLAGS =       $(LIBS) 
 
 # general numerical functions (libdata) #####################
Index: /trunk/Ohana/src/opihi/lib.shell/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/lib.shell/Makefile	(revision 5942)
+++ /trunk/Ohana/src/opihi/lib.shell/Makefile	(revision 5943)
@@ -14,8 +14,5 @@
 #  
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS    =       -lsocket -lnsl -lreadline -ltermcap -lFITS -lohana -lm
 CFLAGS  =       $(INCS)
-CCFLAGS =       $(LIBS) 
 
 # opihi shell functions (libopihi) ########################
Index: /trunk/Ohana/src/opihi/mana/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/mana/Makefile	(revision 5942)
+++ /trunk/Ohana/src/opihi/mana/Makefile	(revision 5943)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -ldvo -lkapa -lFITS -lohana -lX11 -lm
+LIBS1   =       -lsocket -lnsl -lreadline -ldvo -lkapa -lFITS -lohana -lX11 -lm
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
 LIBS    =       $(LIBS2) $(LIBS1) 
Index: /trunk/Ohana/src/opihi/pantasks/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pantasks/Makefile	(revision 5942)
+++ /trunk/Ohana/src/opihi/pantasks/Makefile	(revision 5943)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -ldvo -lkapa -lFITS -lohana -lX11 -lm
+LIBS1   =       -lsocket -lnsl -lreadline -ldvo -lkapa -lFITS -lohana -lX11 -lm
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
 LIBS    =       $(LIBS2) $(LIBS1) 
Index: /trunk/Ohana/src/opihi/pclient/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pclient/Makefile	(revision 5942)
+++ /trunk/Ohana/src/opihi/pclient/Makefile	(revision 5943)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lkapa -lFITS -lohana -lX11 -lm
+LIBS1   =       -lsocket -lnsl -lreadline -lkapa -lFITS -lohana -lX11 -lm
 LIBS2   =       -lbasiccmd -lshell -ldata
 LIBS    =       $(LIBS2) $(LIBS1) 
Index: /trunk/Ohana/src/opihi/pcontrol/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 5942)
+++ /trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 5943)
@@ -15,5 +15,5 @@
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
 LFLAGS  =       -L$(LLIB) -L$(LIB)
-LIBS1   =       -lsocket -lnsl -lreadline -ltermcap -lkapa -lFITS -lohana -lX11 -lm
+LIBS1   =       -lsocket -lnsl -lreadline -lkapa -lFITS -lohana -lX11 -lm
 LIBS2   =       -lbasiccmd -lshell -ldata
 LIBS    =       $(LIBS2) $(LIBS1)