Index: trunk/Ohana/src/libtap/Makefile
===================================================================
--- trunk/Ohana/src/libtap/Makefile	(revision 8631)
+++ trunk/Ohana/src/libtap/Makefile	(revision 10298)
@@ -16,9 +16,5 @@
 DESTMAN	=	$(LMAN)
 
-#  
-INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -L$(XLIB) -ldvo -lkapa -lFITS -lohana -lz -lm
-CFLAGS	=	$(INCS)
-LFLAGS	=	$(LIBS)
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH)
 
 TAP = $(SRC)/tap.$(ARCH).o