Index: trunk/Ohana/src/opihi/mana/Makefile
===================================================================
--- trunk/Ohana/src/opihi/mana/Makefile	(revision 11084)
+++ trunk/Ohana/src/opihi/mana/Makefile	(revision 11891)
@@ -1,5 +1,5 @@
-include ../../../Configure
 default: mana
 
+include ../../../Configure
 HOME    =       $(ROOT)/src/opihi
 SRC     =       $(HOME)/mana
@@ -8,12 +8,14 @@
 INC     =       $(HOME)/include
 DATA    =       $(DESTDATA)/mana
+include ../Makefile.Common
 
-# link flags 
-LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
-LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LFLAGS  =       -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBS2) $(LIBS1) 
+# programs may add their own internal requirements here
+LIBS1   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
+LIBS2   =       -ldvo -lkapa -lFITS -lohana
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = $(LIBS1) $(LIBS2) $(BASE_LDFLAGS)
 
 # mana user commands and support functions ########################
-
 funcs = \
 $(SRC)/init.$(ARCH).o \
@@ -46,4 +48,2 @@
 
 .PHONY: mana
-
-include ../Makefile.Common