===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.20
diff -u -p -r1.14 -r1.20
--- OpenXM/src/kan96xx/Kan/Makefile.in	2003/11/24 08:16:13	1.14
+++ OpenXM/src/kan96xx/Kan/Makefile.in	2004/06/25 04:37:54	1.20
@@ -1,4 +1,4 @@
-###  $OpenXM: OpenXM/src/kan96xx/Kan/Makefile.in,v 1.13 2003/11/24 02:33:39 takayama Exp $
+###  $OpenXM: OpenXM/src/kan96xx/Kan/Makefile.in,v 1.19 2004/06/24 12:45:15 takayama Exp $
 #
 #   depends on install-gmp, install-gc [install-asir-gc] 
 #              ( cd ../plugin ; make )
@@ -6,9 +6,13 @@
 all : configure sm1
 # .SUFFIXES:
 ########################## configuration ##############################
-OpenXM_HOME=../../..
+OpenXM_HOME=@prefix@
 OpenXM_include=${OpenXM_HOME}/include
 OpenXM_lib=${OpenXM_HOME}/lib
+#
+OpenXM_HOME_debug=../../..
+OpenXM_include_debug=${OpenXM_HOME_debug}/include
+OpenXM_lib_debug=${OpenXM_HOME_debug}/lib
 
 CC=@CC@
 RANLIB=@RANLIB@
@@ -29,14 +33,14 @@ TRANS = ../trans
 PLUGIN_PROTOTYPE  = $(PLUGIN)/mathcap.h $(PLUGIN)/file2.h $(PLUGIN)/sm1Socket.h  $(PLUGIN)/cmo.h $(PLUGIN)/ox.h $(TRANS)/trans.h
 PLUGIN_LIB  = $(PLUGIN)/sm1Socket.a  $(PLUGIN)/cmo.a $(PLUGIN)/file2.a $(PLUGIN)/ox.a $(TRANS)/trans.a
 PLUGIN_EXT = $(PLUGIN)/file2.hh $(PLUGIN)/sm1Socket.hh $(PLUGIN)/cmo.hh  $(PLUGIN)/ox.hh $(TRANS)/trans.hh
-PLUGIN_SM1 = $(PLUGIN)/sm1Socket.sm1 $(PLUGIN)/file2.sm1 $(PLUGIN)/cmo.sm1 $(PLUGIN)/oxx.sm1 $(TRANS)/trans.sm1
+PLUGIN_SM1 = $(PLUGIN)/sm1Socket.sm1 $(PLUGIN)/file2.sm1 $(PLUGIN)/cmo.sm1 $(PLUGIN)/oxx.sm1 $(TRANS)/trans.sm1 $(TRANS)/polymake.sm1
 PLUGIN_LINKFLAG = 
 ############################ end of configuration ########################
 
 configure: Makefile
 
 Makefile: Makefile.in
-	sh ./configure
+	sh ./configure --prefix=@prefix@
 
 
 HEADERS = datatype.h  stackm.h lookup.h extern.h  kclass.h 
@@ -45,7 +49,7 @@ HEADERS = datatype.h  stackm.h lookup.h extern.h  kcla
 
 kanlibP = kanExport0.o kanExport1.o
 kanlibS1 = stackmachine.o 
-kanlibS2 = scanner.o scanner2.o list.o global.o kclass.o
+kanlibS2 = scanner.o scanner2.o list.o global.o kclass.o shell.o
 kanlibS3 = usage.o option.o
 kanlibS4 = primitive.o
 kanlibK = matrix.o poly4.o replace.o poly3.o poly3a.o poly.o output.o coeff.o order.o switch.o poly2.o parser.o parserpass0.o rat.o ext.o
@@ -54,13 +58,13 @@ kanlibKclass = Kclass/sample.o Kclass/rawcmo.o Kclass/
 
 ##### Add also to Kclass/Makefile
 Kclass/sample.o : $(HEADERS) Kclass/sample.c
-	(cd Kclass ; make CC=${CC} OpenXM_HOME=../${OpenXM_HOME} CFLAGS='${CFLAGS}' sample.o )
+	(cd Kclass ; make CC=${CC} OpenXM_HOME=@prefix@ CFLAGS='${CFLAGS}' sample.o )
 Kclass/rawcmo.o : $(HEADERS) Kclass/rawcmo.c
-	(cd Kclass ; make CC=${CC} OpenXM_HOME=../${OpenXM_HOME} CFLAGS='${CFLAGS}' rawcmo.o )
+	(cd Kclass ; make CC=${CC} OpenXM_HOME=@prefix@ CFLAGS='${CFLAGS}' rawcmo.o )
 Kclass/indeterminate.o : $(HEADERS) Kclass/indeterminate.c
-	(cd Kclass ; make CC=${CC} OpenXM_HOME=../${OpenXM_HOME} CFLAGS='${CFLAGS}' indeterminate.o )
+	(cd Kclass ; make CC=${CC} OpenXM_HOME=@prefix@ CFLAGS='${CFLAGS}' indeterminate.o )
 Kclass/tree.o : $(HEADERS) Kclass/tree.c
-	(cd Kclass ; make CC=${CC} OpenXM_HOME=../${OpenXM_HOME} CFLAGS='${CFLAGS}' tree.o )
+	(cd Kclass ; make CC=${CC} OpenXM_HOME=@prefix@ CFLAGS='${CFLAGS}' tree.o )
 
 
 ######
@@ -90,8 +94,9 @@ coeff.o : extern2.h $(HEADERS)
 output.o : extern2.h $(HEADERS)
 poly.o : extern2.h $(HEADERS)
 rat.o : extern2.h $(HEADERS)
-ext.o : extern2.h $(HEADERS) plugin.h plugin.hh Kclass/tree.hh 
+ext.o : extern2.h $(HEADERS) plugin.h plugin.hh Kclass/tree.hh  
 sm.o : sm.c $(HEADERS)
+shell.o : shell.c $(HEADERS) plugin.h
 
 sm1 : sm.o  $(kanlibS1) $(kanlibS2) $(kanlibS3) $(kanlibS4) $(kanlibP) $(kanlibK) $(kanlibK2) $(kanlibKclass) $(PLUGIN_LIB)
 	${CC} -I${OpenXM_include} $(CFLAGS) -o sm1 sm.o $(kanlibS1) $(kanlibS2) $(kanlibS3) $(kanlibS4) $(kanlibP) $(kanlibK) $(kanlibK2)  $(kanlibKclass) $(PLUGIN_LIB) $(PLUGIN_LINKFLAG) $(LIBS2) $(LIBS) 
@@ -106,7 +111,7 @@ $(kanlibS4) : $(HEADERS) gradedset.h
 
 kanlib.a : $(kanlibS1) $(kanlibS2) $(kanlibS3) $(kanlibS4) $(kanlibP) $(kanlibK) $(kanlibK2) $(kanlibKclass) $(PLUGIN_LIB) kanlib.o ${OpenXM_lib}/libox_pathfinder.a
 	(cd plugin-tmp; /bin/rm -f *.o; ../ar-decomp $(PLUGIN_LIB) ; cp ../kanlib.o .)
-	(cd plugin-tmp; ../ar-decomp ${OpenXM_lib}/libox_pathfinder.a)
+	(cd plugin-tmp; ../ar-decomp2 ${OpenXM_lib}/libox_pathfinder.a)
 	ar ru kanlib.a $(kanlibS1) $(kanlibS2) $(kanlibS3) $(kanlibS4) $(kanlibP) $(kanlibK) $(kanlibK2) $(kanlibKclass) plugin-tmp/*.o
 	${RANLIB} kanlib.a