Index: /trunk/psLib/test/astronomy/Makefile
===================================================================
--- /trunk/psLib/test/astronomy/Makefile	(revision 1499)
+++ /trunk/psLib/test/astronomy/Makefile	(revision 1500)
@@ -3,6 +3,6 @@
 ##  Makefile:   test/astronomy
 ##
-##  $Revision: 1.10 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-08-10 23:22:40 $
+##  $Revision: 1.11 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-08-12 02:34:58 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16,7 +16,6 @@
 include ../../src/Makefile.Globals
 
-PSLIB_INCL_DIR = ../../include
-
-PSLIB_LIB_DIR = ../../lib
+CFLAGS := -I../../include $(CFLAGS)
+LDFLAGS := -L../../lib -lpslib -lpstest $(LDFLAGS)
 
 TARGET = tst_psTime_01 \
@@ -29,41 +28,14 @@
          tst_psMetadata_06
 
-DEPENDENCIES = $(addprefix builddir/,$(addsuffix .d,$(TARGET)))
 OBJS = $(addprefix builddir/,$(addsuffix .o,$(TARGET)))
 
-all: builddir $(TARGET)
-
-builddir:
-	mkdir builddir
-
-include $(DEPENDENCIES)
+all: $(TARGET)
 
 clean:
-	@echo "    Deleting executable and binary files for 'test/astronomy'"
-	$(RM) $(OBJS) *.lint builddir/*.i
+	@echo "    Deleting executable and binary files for 'test/collections'"
+	$(RM) $(OBJS)
 
 distclean: clean
 	$(RM) $(TARGET)
-
-cleandependencies:
-	$(RM) $(DEPENDENCIES)
-
-builddir/%.o : builddir/%.i
-	$(CC) $(CFLAGS) -I$(PSLIB_INCL_DIR) -c -o $@ $<
-
-builddir/%.o : %.c
-	$(CC) $(CFLAGS) -I$(PSLIB_INCL_DIR) -c -o $@ $<
-
-%   : builddir/%.o
-	$(CC) -o $@ $< -L$(PSLIB_LIB_DIR) -lpslib -lpstest $(LDFLAGS)
-
-%.lint: %.c
-	splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@
-
-builddir/%.i: %.c
-	$(CC) -E $(CFLAGS) $(CPPFLAGS) -I$(PSLIB_INCL_DIR) -o $@ $<
-
-builddir/%.d: %.c
-	$(CC) -MM $(CFLAGS) -I$(PSLIB_INCL_DIR) $< | sed 's|\(.*\.o\)|builddir/\1|' > $@
 
 install: $(testbindir) $(testbindir)/verified $(TARGET)
@@ -77,3 +49,2 @@
 	mkdir -p $(testbindir)/verified
 
-