Index: trunk/Ohana/src/kapa/Makefile
===================================================================
--- trunk/Ohana/src/kapa/Makefile	(revision 5852)
+++ 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)
 
-