1 files changed, 40 insertions, 29 deletions
diff --git a/src/AMRPlus/makefile b/src/AMRPlus/makefile
index 56b24de..5cbb309 100644
--- a/src/AMRPlus/makefile
+++ b/src/AMRPlus/makefile
@@ -1,45 +1,55 @@
+CC = cc
+CPP = @CPP@
+CXX = c++
+AR = /usr/bin/ar
+
+DEBUG_FLAGS = -g
+ARCH_FLAGS = 
+
+IEEEHOME = /usr/local/apps/FlexIO
+HDFHOME = /usr/local/apps/HDF4.1r4
+H5HOME = /usr/local/apps/hdf5
+
+ALL_INC = -I$(IEEEHOME)/include -I$(HDFHOME)/include -I$(H5HOME)/include
+
+CFLAGS = $(DEBUG_FLAGS) $(ARCH_FLAGS)  -DOPENGL=1 -DWITH_HDF4=1 -DWITH_HDF5=1 
+COMP_FLAGS = $(DEBUG_FLAGS)
+CXXFLAGS = $(CFLAGS)
+
+LIBS = -L. -L$(IEEEHOME)/lib -lAMR -lhlio -lieeeio -L$(HDFHOME)/lib -lhdfio -lmfhdf -ldf -ljpeg -lz -L$(H5HOME)/lib -lh5io -lhdf5 -L/usr/X11R6/lib -lXext -lXt -lX11 -lm -lGL -lpthread
+
+
 SRCS=  \
       AMRwriterPlus.C \
       AMRgridreaderPlus.C  \
       AMRfilereaderPlus.C  \
       flexset.C \
       AMRreaderPlus.C 
-      
+
 OBJS = $(SRCS:.C=.o)
-DEPEND  = Dpndfile
+#DEPEND  = Dpndfile
 ####################
 
 SHELL = /bin/sh
 
-IEEE_ROOT=/nfs/zeus/lcascr1/mahall/AmrProject/FlexIO
-
-
-ALL_INC =  -I$(IEEE_ROOT)/include -I$(HDF_ROOT)/include
-
 
-DEFS =
-CC = cc
-#COMP_FLAGS = -n32 -mips4 -LNO -IPA -Ofast
-COMP_FLAGS = -64 -mips4 -g
-
-CFLAGS = -c -float ${COMP_FLAGS} -DOPENGL  \
-	-I$(IEEE_ROOT)/include \
-	-DVTK21 $(VTKINCD) -noinline -woff 1681-1682,3322 
-CXXFLAGS    = ${CFLAGS}
+AMRwriterPlus.o: AMRwriterPlus.C
+	$(CXX) $(CXXFLAGS) $(ALL_INC) -c AMRwriterPlus.C 
 
+AMRgridreaderPlus.o: AMRgridreaderPlus.C
+	$(CXX) $(CXXFLAGS) $(ALL_INC) -c AMRgridreaderPlus.C 
 
-LINK        = ${CPP}
-LIBS =   -L$(IEEE_ROOT)/lib -L$(HDF_ROOT)/lib -L. \
-		-lhlio  -lieeeio -lAMR \
-		-lX11  -lm 	\
-		 -lGL  -lICE -lXt 
+AMRfilereaderPlus.o: AMRfilereaderPlus.C
+	$(CXX) $(CXXFLAGS) $(ALL_INC) -c AMRfilereaderPlus.C 
 
-.C: $@.o  ${OBJS}
-	$(CXX) ${COMP_FLAGS}  -o $@ \
-	${OBJS} $@.o $(LIBS)
+flexset.o: flexset.C
+	$(CXX) $(CXXFLAGS) $(ALL_INC) -c flexset.C 
 
+AMRreaderPlus.o: AMRreaderPlus.C
+	$(CXX) $(CXXFLAGS) $(ALL_INC) -c AMRreaderPlus.C 
 
-include $(DEPEND)
+AMRPlusConv.o: AMRPlusConv.C
+	$(CXX) $(CXXFLAGS) $(ALL_INC) -c AMRPlusConv.C
 
 AMRPlusConv: AMRPlusConv.o  libAMRPlus.a
 	$(CXX) ${COMP_FLAGS}  -o $@ \
@@ -53,17 +63,18 @@ readtest: readtest.o  libAMRPlus.a
 	$(CXX) ${COMP_FLAGS}  -o $@ \
 	$@.o -lAMRPlus $(LIBS) 
 
-filereadtest:filereadtest.o  libAMRPlus.a
+filereadtest:filereadtest.o  libAMRPlus.a 
 	$(CXX) ${COMP_FLAGS}  -o $@ \
 	$@.o -lAMRPlus $(LIBS) 
 
+
 libAMRPlus.a: ${OBJS}
 	rm -f libAMRPlus
 	ar r libAMRPlus.a ${OBJS}
 
-dep: $(SRCS) 
-	CC -M ${ALL_INC} $(SRCS) readtest.C > $(DEPEND)
-	smake
+#dep: $(SRCS) 
+#	gcc -M ${ALL_INC} $(SRCS) readtest.C > $(DEPEND)
+#	gmake
 
 
 clean: