Index: trunk/Ohana/src/misc/Makefile
===================================================================
--- trunk/Ohana/src/misc/Makefile	(revision 10305)
+++ trunk/Ohana/src/misc/Makefile	(revision 10509)
@@ -1,20 +1,19 @@
+default: misc
+help:
+	@echo "make options: misc (default)"
+
 include ../../Configure
 HOME 	=	$(ROOT)/src/misc
-
-default: misc
-
 SRC	=	$(HOME)/src
 LIB	= 	$(HOME)/lib
-INC	=	$(HOME)/include
 MAN	=	$(HOME)/doc
 BIN	=	$(HOME)/bin
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	=	$(HOME)/include
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+CFLAGS	=	-I$(INC) -I$(DESTINC) $(INCDIRS) -D$(ARCH)
+LDFLAGS = 	-L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBFLAGS)
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+
+# these are all programs which just depend on a single c file: foo : foo.c
 
 PROGRAMS = gconfig mknames fhead ftable fields list_astro glockfile \
@@ -24,11 +23,10 @@
 misc: $(PROGRAMS)
 
-FAKESRC = $(SRC)/fakestars.$(ARCH).o $(SRC)/random.$(ARCH).o
+$(PROGRAMS): % : $(BIN)/%.$(ARCH)
 
-$(BIN)/fakestars.$(ARCH): $(FAKESRC)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) -o $(BIN)/fakestars.$(ARCH) $(FAKESRC) $(LIBS) $(CCFLAGS)
+fakestars: $(BIN)/fakestars.$(ARCH)
+$(BIN)/fakestars.$(ARCH): $(SRC)/fakestars.$(ARCH).o $(SRC)/random.$(ARCH).o
 
-fakestars: $(DESTBIN)/fakestars
+#### cfhtlog is special (requires additional libs and includes)
 
 $(BIN)/cfhtlog.$(ARCH): $(SRC)/cfhtlog.c
@@ -42,18 +40,16 @@
 	make $(DESTBIN)/cfhtlog
 
-$(PROGRAMS): % : $(BIN)/%.$(ARCH)
-
-# dependancy rules for binary code #########################
+# copied from Makefile.Common : use a single c file: foo : foo.c
 .PRECIOUS: %.$(ARCH).o
 .PRECIOUS: $(BIN)/%.$(ARCH)
 
 %.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@ 
+	$(CC) $(CFLAGS) -c $< -o $@
 
 $(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $^ -o $@ $(LFLAGS)
+	$(CC) -o $@ $^ $(LDFLAGS)
 
-$(DESTBIN)/%: $(BIN)/%.$(ARCH)
+$(DESTBIN)/%: $(BIN)/%.$(ARCH) 
 	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
 	rm -f $(DESTBIN)/$*
@@ -63,18 +59,18 @@
 	make $(DESTBIN)/$*
 
+install:
+	for i in $(PROGRAMS); do make $$i.install || exit; done
+
 %.clean:
 	rm -f $(SRC)/$*.$(ARCH).o
 	rm -f $(BIN)/$*.$(ARCH)
 
-# utilities #################################################
+clean:
+	rm -f `find . -name "*.o"`
+	rm -f `find . -name "*.o"`
+	rm -f `find . -name "*~"`
+	rm -f `find . -name "#*"`
 
-install:
-	for i in $(PROGRAMS); do make $$i.install || exit; done
-
-clean:
-	for i in $(PROGRAMS); do make $$i.clean; done
-	rm -f */*~
-	rm -f */#*
-	rm -f *~
-	rm -f #*
-
+dist: clean
+	rm -rf $(BIN)
+	rm -rf $(LIB)