Index: trunk/Ohana/src/delstar/Makefile
===================================================================
--- trunk/Ohana/src/delstar/Makefile	(revision 10305)
+++ trunk/Ohana/src/delstar/Makefile	(revision 10342)
@@ -1,7 +1,8 @@
+default: delstar
+help:
+	@echo "make options: addstar (default)"
+
 include ../../Configure
-
 HOME 	=	$(ROOT)/src/delstar
-PROGRAM =       delstar
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
@@ -9,12 +10,11 @@
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+include ../../Makefile.Common
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+CFLAGS	:=	$(CFLAGS) -fPIC
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+
+delstar: $(BIN)/delstar.$(ARCH)
+install: $(DESTBIN)/delstar
 
 DELSTAR = \
@@ -39,46 +39,4 @@
 $(SRC)/RegionOps.$(ARCH).o   	  
 
-default: $(PROGRAM)
-help:
-	@echo "make options: delstar (default)"
-
 $(DELSTAR): $(INC)/delstar.h
 $(BIN)/delstar.$(ARCH) : $(DELSTAR)
-delstar   : $(BIN)/delstar.$(ARCH)
-
-INSTALL = delstar
-
-# 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)
-
-%.clean :
-	rm -f $(BIN)/$*.$(ARCH)
-
-%.install:
-	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 "#*"`