===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2002/07/24 09:52:10	1.33
+++ OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2003/02/14 22:29:13	1.34
@@ -2,7 +2,7 @@
  * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
  * All rights reserved.
  * 
- * $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.32 2001/12/25 08:59:48 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.33 2002/07/24 09:52:10 noro Exp $ 
 */
 #include "config.h"
 
@@ -103,58 +103,58 @@ CC = cc -qchars=signed
 #endif
 
 #ifdef USE_PARI
-PARI=1
-PARIINC = $(ROOTDIR)/include/pari
+PARI= -DPARI
+PARIINC = -I$(ROOTDIR)/include/pari
 #if defined(OpenXM_HOME)
 PARILIB = $(ROOTDIR)/lib/lib$(LIBPARI).a
 #else
 PARILIB = -L/usr/local/lib -l$(LIBPARI)
 #endif
 #else
-PARI=0
-PARIINC = .
+PARI=
+PARIINC = 
 PARILIB =
 #endif
 
 #ifdef USE_LAPACK
-LAPACK=1
+LAPACK= -DLAPACK
 LAPACKLIB = -llapack -lblas -lI77 -lF77
 #else
-LAPACK=0
+LAPACK=
 LAPACKLIB =
 #endif
 
 #ifdef USE_PLOT
-DO_PLOT=1
+DO_PLOT= -DDO_PLOT
 #else
-DO_PLOT=0
+DO_PLOT=
 #endif
 
 #ifdef USE_FFT_FLOAT
-USE_FLOAT=1
+USE_FLOAT= -DUSE_FLOAT
 #else
-USE_FLOAT=0
+USE_FLOAT=
 #endif
 
 #ifdef USE_MPI
-MPI=1
+MPI= -DMPI
 MPILIB=-L/opt/FJSVmpi2/lib -lmpi -L/opt/FSUNaprun/lib -lmpl -lemi -lthread
-MPIINC=/opt/FJSVmpi2/include
+MPIINC=-I/opt/FJSVmpi2/include
 #else
-MPI=0
+MPI=
 MPILIB=
-MPIINC=.
+MPIINC=
 #endif
 
 #ifdef USE_FEP
-FEP=1
+FEP= -DFEP
 #if defined(OpenXM_HOME)
 FEPLIB= $(ROOTDIR)/lib/libreadline.a
 #else
 FEPLIB = -lreadline -ltermcap
 #endif
 #else
-FEP=0
+FEP=
 FEPLIB =
 #endif
 
@@ -170,5 +170,5 @@ INTERVALDEF = -DINTERVAL
 INTERVALDEF =
 #endif
 
-INCLUDES= -I$(TOP)/include -I$(TOP)/parse -I$(TOP)/io -I$(TOP)/gc/include -I$(PARIINC) -I$(MPIINC)
-DEFINES= $(INTERVALDEF) -DINET=$(INET) -DPARI=$(PARI) -DLAPACK=$(LAPACK) -DDO_PLOT=$(DO_PLOT) -DUSE_FLOAT=$(USE_FLOAT) $(PARIFLAGS) -DHMEXT -DMPI=$(MPI) -DFEP=$(FEP) $(LINUX_EXTRA_DEFINES)
+INCLUDES= -I. -I$(TOP)/include -I$(TOP)/parse -I$(TOP)/io -I$(TOP)/gc/include $(PARIINC) $(MPIINC)
+DEFINES= $(INTERVALDEF) -DINET=$(INET) $(PARI) $(LAPACK) $(DO_PLOT) $(USE_FLOAT) $(PARIFLAGS) -DHMEXT $(MPI) $(FEP) $(LINUX_EXTRA_DEFINES)