Index: trunk/Ohana/src/kii/Makefile
===================================================================
--- trunk/Ohana/src/kii/Makefile	(revision 10305)
+++ trunk/Ohana/src/kii/Makefile	(revision 10342)
@@ -1,9 +1,8 @@
+default: kii
+help:
+	@echo "make options: kii (default)"
+
 include ../../Configure
 HOME 	=	$(ROOT)/src/kii
-PROGRAM =       kii
-
-default: $(PROGRAM)
-
-INC	=	$(HOME)/include
 LIB	=	$(HOME)/lib
 BIN	=	$(HOME)/bin
@@ -16,11 +15,11 @@
 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) -ldvo -lFITS -lkapa -lohana $(LIBFLAGS) 
+INC	=	$(HOME)/include
+include ../../Makefile.Common
+
+LDFLAGS := 	-lkapa -ldvo -lFITS -lohana $(LDFLAGS)
+
+kii: $(BIN)/kii.$(ARCH)
+install: $(DESTBIN)/kii
 
 # local source / object files ########################
@@ -84,5 +83,4 @@
 $(ZDIR)/CreateZoom16.$(ARCH).o
 
-
 OBJ  =  $(BOBJ) $(COBJ) $(EOBJ) $(MOBJ) $(OOBJ) $(POBJ) $(SOBJ) $(ZOBJ)
 
@@ -93,34 +91,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)/kii.$(ARCH): $(OBJ)