From 3fae4cff5224bc6139f2a49016d09dad54b27a8c Mon Sep 17 00:00:00 2001
From: Dave Whipp <dwhipp@dal.ca>
Date: Mon, 21 Dec 2009 18:53:42 +0000
Subject: [PATCH] Updated to work like other Makefiles
---
src/VTK/Makefile | 63 ++++++++++++++++++++++++++++++++++--------------
1 file changed, 45 insertions(+), 18 deletions(-)
diff --git a/src/VTK/Makefile b/src/VTK/Makefile
index 8c2c1f44..eb58777f 100755
--- a/src/VTK/Makefile
+++ b/src/VTK/Makefile
@@ -1,6 +1,11 @@
-.SUFFIXES:.out .o .s .c .F .f .f90 .e .r .y .yr .ye .l .p .sh .csh .h
+# Makefile for program post
-include ../Makefile.pathscale
+NAME=post
+include ../Makefile.inc
+INCLUDES=
+BIN=$(NAME)$(BITS)
+
+# object (make VTK output for visualization)
OBJECTS = \
../module_constants.o \
@@ -13,22 +18,44 @@ find_volume.o \
rivers.o \
post.o
-OBJECTSP = \
-../module_constants.o \
-module_gauss.o\
-../compute_dhdx_dhdy_dhdz.o\
-../compute_positive_volume.o\
-ps.o \
-../toolbox.o \
-find_volume.o \
-rivers.o \
-topo.o
+OCTREE = ../OCTREE/libOctree.a
+
+#OBJECTSP = \
+#../module_constants.o \
+#module_gauss.o\
+#../compute_dhdx_dhdy_dhdz.o\
+#../compute_positive_volume.o\
+#ps.o \
+#../toolbox.o \
+#find_volume.o \
+#rivers.o \
+#topo.o
+
+#topo: $(OBJECTSP)
+# $(F90) -O3 $(OBJECTSP) ../OCTREE/libOctree.a -o topo
+
+# make the program
+#
+all: $(BIN)
+$(BIN): $(OBJECTS)
+ @echo "$(F90) $(FFLAGS) $(OPTIONS) $(OBJECTS) -o $(BIN)" \
+1>>$(BIN).link.stdout 2>>$(BIN).link.stderr
+ $(F90) $(FFLAGS) $(OPTIONS) $(OBJECTS) $(OCTREE) -o $(BIN) \
+1>>$(BIN).link.stdout 2>>$(BIN).link.stderr
-.f90.o:
- $(F90) $(FLAGS) $(INCLUDE) $*.f90
+.PHONY: objclean
+objclean:
+ rm -f *.o *.mod $(COMPILE_OUT)
-post: $(OBJECTS)
- $(F90) -O3 $(OBJECTS) ../OCTREE/libOctree.a -o post
+.PHONY: distclean
+distclean: objclean
+ rm -f $(NAME) $(BIN).link.stderr $(BIN).link.stdout
-topo: $(OBJECTSP)
- $(F90) -O3 $(OBJECTSP) ../OCTREE/libOctree.a -o topo
+#.PHONY: more-output
+#more-output:
+# @echo "--"
+# @echo "compiler output from `pwd`"
+# @if test -e $(COMPILE_OUT) ; then ${PAGER} $(COMPILE_OUT) ; fi
+# @echo "--"
+# @echo "$(AR) output from `pwd`"
+# @if test -e $(LIBFILE).ar ; then ${PAGER} $(LIBFILE).ar ; fi
--
GitLab