Index: trunk/Ohana/src/addstar/Makefile
===================================================================
--- trunk/Ohana/src/addstar/Makefile	(revision 10305)
+++ trunk/Ohana/src/addstar/Makefile	(revision 10315)
@@ -4,5 +4,4 @@
 
 include ../../Configure
-
 HOME 	=	$(ROOT)/src/addstar
 BIN	=	$(HOME)/bin
@@ -11,12 +10,8 @@
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
-
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+include ../../Makefile.Common
+
+CFLAGS	:=	$(CFLAGS) -fPIC
+LDFLAGS := 	-lkapa -ldvo -lFITS -lohana $(LDFLAGS)
 
 ADDSTAR = \
@@ -209,6 +204,4 @@
 addstart                : $(BIN)/addstart.$(ARCH)
 $(BIN)/addstart.$(ARCH) : $(ADDSTART)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $^ -o $@ $(LFLAGS) -lpthread
 
 addstarc                : $(BIN)/addstarc.$(ARCH)
@@ -231,22 +224,7 @@
 all: addstar addstarc addstard addstart sedstar load2mass
 
-INSTALL = addstar
+INSTALL = addstar addstarc addstard addstart sedstar load2mass
 
 # dependancy rules for binary code #########################
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $^ -o $@ $(LFLAGS)
-
-$(DESTBIN)/%: $(BIN)/%.$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$*
-	cp $(BIN)/$*.$(ARCH) $(DESTBIN)/$*
-
 $(INSTALL) $(DEVEL): % : $(BIN)/%.$(ARCH)
 
@@ -257,12 +235,4 @@
 	make $(DESTBIN)/$*
 
-# utilities #################################################
-
 install:
 	for i in $(INSTALL); do make $$i.install; done
-
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`