From 451c816a3a574b71505dfe93b3a472960198da52 Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Fri, 18 Apr 2003 23:47:07 +0000
Subject: [PATCH] *** empty log message ***

---
 Cantera/matlab/cantera/buildux.m |  2 +-
 examples/cxx/Makefile.in         |  2 +-
 tools/templates/f77/demo.mak     | 99 --------------------------------
 3 files changed, 2 insertions(+), 101 deletions(-)
 delete mode 100644 tools/templates/f77/demo.mak

diff --git a/Cantera/matlab/cantera/buildux.m b/Cantera/matlab/cantera/buildux.m
index f1266155a..e68e76e5f 100755
--- a/Cantera/matlab/cantera/buildux.m
+++ b/Cantera/matlab/cantera/buildux.m
@@ -5,5 +5,5 @@ mex private/ctmethods.cpp private/ctfunctions.cpp ...
     private/thermomethods.cpp private/kineticsmethods.cpp ...
     private/transportmethods.cpp private/reactormethods.cpp ...
     private/wallmethods.cpp private/flowdevicemethods.cpp ...
-     -L/Users/dgg/dv/sf/cantera/lib -lct14 -loneD -lzeroD -ltransport -lconverters -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas  -lg2c -lgcc
+     -L/home/goodwin/dv/sf/cantera/lib -lct14 -loneD -lzeroD -ltransport -lconverters -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas   -L/usr/lib/gcc-lib/i386-redhat-linux/2.96 -L/usr/lib/gcc-lib/i386-redhat-linux/2.96/../../.. -lg2c -lm
 disp('done.');
diff --git a/examples/cxx/Makefile.in b/examples/cxx/Makefile.in
index d48c8660f..d6ee734eb 100755
--- a/examples/cxx/Makefile.in
+++ b/examples/cxx/Makefile.in
@@ -50,7 +50,7 @@ LCXX_END_LIBS = @LCXX_END_LIBS@
 
 
 # the directory where the Cantera libraries are located
-CANTERA_LIBDIR=@CANTERA_LIBDIR@
+CANTERA_LIBDIR=@ctroot@/lib
 
 # required Cantera libraries
 CANTERA_LIBS = 
diff --git a/tools/templates/f77/demo.mak b/tools/templates/f77/demo.mak
deleted file mode 100644
index 73b2be44f..000000000
--- a/tools/templates/f77/demo.mak
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# This Makefile builds a Fortran 77 application that uses Cantera.  By
-# default, the main program file is 'demo.f,' which prints out some
-# properties of a reacting gas mixture. It uses the library
-# 'demo_ftnlib.cpp,' which contains Fortran-callable functions that
-# are implemented with C++ calls to Cantera.  
-
-# To build program 'demo', simply type 'make', or 'make -f <this
-# file>' if this file is named something other than 'Makefile.'  
-
-# Once you have verified that the demo runs, edit this file to replace
-# object file 'demo.o' with your own object file or files. You may
-# continue to use 'demo_ftnlib' if it serves your needs, or else
-# replace it with a different interface library.
-
-
-#------------------------  edit this block ---------------------------------
-
-# the name of the executable program to be created
-PROG_NAME = demo
-
-# the object files to be linked together. 
-OBJS = demo.o demo_ftnlib.o
-
-# additional flags to be passed to the linker. If your program
-# requires other external libraries, put them here
-LINK_OPTIONS = 
-
-#---------------------------------------------------------------------------
-# You probably don't need to edit anything below.
-
-
-# the Fortran compiler
-FORT = g77
-
-# Fortran compile flags  
-FORT_FLAGS = -O2 -fno-second-underscore 
-
-# Fortran libraries
-FORT_LIBS = -lg2c -lgcc
-
-# the C++ compiler
-CXX = g++
-
-# C++ compile flags
-CXX_FLAGS = -O0 -Wall
-
-# external libraries
-EXT_LIBS =  -loneD -lzeroD -ltransport -lconverters -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas 
-
-# the directory where the Cantera libraries are located
-CANTERA_LIBDIR=/Users/dgg/inst/lib/cantera
-
-# the directory where Cantera include files may be found.
-CANTERA_INCDIR=/Users/dgg/inst/include/cantera
-
-# flags passed to the C++ compiler/linker for the linking step
-LCXX_FLAGS = -L$(CANTERA_LIBDIR) -O0 -Wall
-
-# how to compile C++ source files to object files
-.cpp.o:
-	$(CXX) -c $< -I$(CANTERA_INCDIR) $(CXX_FLAGS)
-
-# how to compile Fortran source files to object files
-.f.o: 
-	$(FORT) -c $< $(FORT_FLAGS)
-
-PROGRAM = $(PROG_NAME)$(EXE_EXT)
-
-DEPENDS = $(OBJS:.o=.d)
-
-all: $(PROGRAM)
-
-$(PROGRAM): $(OBJS)
-	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(CANTERA_LIBS) $(LINK_OPTIONS) $(EXT_LIBS)  $(FORT_LIBS)
-
-%.d:
-	g++ -MM $*.cpp > $*.d
-
-clean:
-	$(RM) $(OBJS) $(PROGRAM)
-
-depends: $(DEPENDS)
-	cat *.d > .depends
-	$(RM) $(DEPENDS) 
-
-TAGS: 
-	etags *.h *.cpp
-
-ifeq ($(wildcard .depends), .depends)
-include .depends
-endif
-
-
-
-
-
-