Index: trunk/Ohana/src/kapa/Makefile
===================================================================
--- trunk/Ohana/src/kapa/Makefile	(revision 10305)
+++ trunk/Ohana/src/kapa/Makefile	(revision 10342)
@@ -1,37 +1,23 @@
+default: kapa
+help:
+	@echo "make options: kapa (default)"
+
 include ../../Configure
 HOME 	=	$(ROOT)/src/kapa
-PROGRAM =       kapa
-
-default: $(PROGRAM)
-
 LIB	=	$(HOME)/lib
-INC	=	$(HOME)/include
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-BDIR	=	$(HOME)/button
-CDIR	=	$(HOME)/colorbar
 EDIR	=	$(HOME)/event
-MDIR	=	$(HOME)/misc
-ODIR	=	$(HOME)/overlay
-PDIR	=	$(HOME)/picture
 GDIR	=	$(HOME)/graph
 SDIR	=	$(HOME)/setup
-ZDIR	=	$(HOME)/zoom
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
-#
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -lkapa -ldvo -lFITS -lohana $(LIBFLAGS) 
+INC	=	$(HOME)/include
+include ../../Makefile.Common
+
+LDFLAGS := 	-lkapa -ldvo -lFITS -lohana $(LDFLAGS)
+
+kapa: $(BIN)/kapa.$(ARCH)
+install: $(DESTBIN)/kapa
 
 # local source / object files ########################
-BOBJ = \
-$(BDIR)/ButtonFunctions.$(ARCH).o         $(BDIR)/InButton.$(ARCH).o           \
-$(BDIR)/CheckButtons.$(ARCH).o     	  $(BDIR)/InPicture.$(ARCH).o          \
-$(BDIR)/DrawButton.$(ARCH).o       	  $(BDIR)/InvertButton.$(ARCH).o       \
-$(BDIR)/FlashButton.$(ARCH).o      	  $(BDIR)/PSit.$(ARCH).o               \
-$(SDIR)/DrawBitmap.$(ARCH).o               
-
 EOBJ = \
 $(EDIR)/CheckPipe.$(ARCH).o               $(EDIR)/Stop.$(ARCH).o               \
@@ -72,5 +58,5 @@
 $(SDIR)/MakeCursor.$(ARCH).o
 
-OBJ  =  $(EOBJ) $(GOBJ) $(MOBJ) $(SOBJ) $(BDRAW)
+OBJ  =  $(EOBJ) $(GOBJ) $(SOBJ) $(BDRAW)
 
 # dependancy rules for include files ########################
@@ -80,33 +66,3 @@
 	$(INC)/prototypes.h
 
-#### nothing program-dependant below ####
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) -o $@ $^ $(LFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM)
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-dist: clean
-	rm -f */*.*.o
-	rm -f $(BIN)/$(PROGRAM).*
-
-.SUFFIXES: .$(ARCH).o
-
-%.$(ARCH).o : %.c
-	$(CC) -o $@ -c $< $(CFLAGS)
-
+$(BIN)/kapa.$(ARCH): $(OBJ)