===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/Makefile.in,v
retrieving revision 1.29
retrieving revision 1.36
diff -u -p -r1.29 -r1.36
--- OpenXM/src/kxx/Makefile.in	2004/03/01 09:48:45	1.29
+++ OpenXM/src/kxx/Makefile.in	2006/02/04 02:44:39	1.36
@@ -1,5 +1,4 @@
-##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.28 2004/02/29 03:00:37 takayama Exp $
-#
+##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.35 2004/09/17 03:28:21 takayama Exp $
 #  Depends on  all-kan96xx [source tree of kan96xx at ${Kan96xx} is required]
 #              install-gmp, install-gc, install-util
 #
@@ -16,14 +15,19 @@
 ##             Nothing to do for now.
 ## If you change this file, do not forget to run autoconf and remove .configure_done
 ######### configurations.    
-OpenXM_HOME=../..
+#OpenXM_HOME=../..
+OpenXM_HOME=@prefix@
 Kan96xx=../kan96xx
-OpenXM_contrib=${OpenXM_HOME}/../OpenXM_contrib
 OpenXM_bin=${OpenXM_HOME}/bin
 OpenXM_lib=${OpenXM_HOME}/lib
 OpenXM_include=${OpenXM_HOME}/include
 OXWEAVE=${OpenXM_bin}/oxweave
 KANLIB = ${Kan96xx}/Kan/kanlib.a -L${OpenXM_lib} -lgmp -lgc
+#
+OpenXM_HOME_for_debug=../..
+OpenXM_bin_for_debug=${OpenXM_HOME_for_debug}/bin
+OpenXM_lib_for_debug=${OpenXM_HOME_for_debug}/lib
+OpenXM_include_for_debug=${OpenXM_HOME_for_debug}/include
 ########## end of configurations
 CC=@CC@
 RANLIB=@RANLIB@
@@ -43,7 +47,7 @@ all2 : ox ox_sm1 testclient oxlog
 configure: Makefile
 
 Makefile: Makefile.in
-	./configure
+	(rm -f .configure_done ; ./make-configure)
 
 # configure is added to repo for a while.
 configure-old : Makefile.in configure.in
@@ -67,7 +71,7 @@ ox: oxmain.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/pl
 oxmain.o: oxmain.c ox_kan.h serversm.h
 
 oxd: oxd.o xtag.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o 
-	${CC}  ${STATIC_LINK_FLAG} ${CFLAGS} oxd.o xtag.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o -o oxd  ${LIBS} 
+	${CC}  ${STATIC_LINK_FLAG} ${CFLAGS} oxd.o xtag.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o -o oxd  ${LIBS} -L{OpenXM_lib} -lgc
 oxd.o: oxd.c ox_kan.h serversm.h
 xtag.o: xtag.c 
 oxd-thread: oxd-thread.o xtag.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o
@@ -120,24 +124,24 @@ distclean : clean clean-for-install
 
 ## install targets.
 install-for-debug : clean-for-install install_lib_bin-for-debug
-	${RM} -f ${OpenXM_bin}/ox ${OpenXM_bin}/ox_sm1 ${OpenXM_bin}/oxlog ${OpenXM_bin}/ox100start ${OpenXM_bin}/ox_texmacs
-	ln -f -s  ../src/kxx/ox ${OpenXM_bin}/ox
-	ln -f -s  ../src/kxx/ox_sm1 ${OpenXM_bin}/ox_sm1
-	ln -f -s  ../src/kxx/oxlog ${OpenXM_bin}/oxlog
-	ln -f -s  ../src/kxx/ox100start ${OpenXM_bin}/ox100start
-	ln -f -s  ../src/kxx/ox_texmacs ${OpenXM_bin}/ox_texmacs
+	${RM} -f ${OpenXM_bin_for_debug}/ox ${OpenXM_bin_for_debug}/ox_sm1 ${OpenXM_bin_for_debug}/oxlog ${OpenXM_bin_for_debug}/ox100start ${OpenXM_bin_for_debug}/ox_texmacs
+	ln -f -s  ../src/kxx/ox ${OpenXM_bin_for_debug}/ox
+	ln -f -s  ../src/kxx/ox_sm1 ${OpenXM_bin_for_debug}/ox_sm1
+	ln -f -s  ../src/kxx/oxlog ${OpenXM_bin_for_debug}/oxlog
+	ln -f -s  ../src/kxx/ox100start ${OpenXM_bin_for_debug}/ox100start
+	ln -f -s  ../src/kxx/ox_texmacs ${OpenXM_bin_for_debug}/ox_texmacs
 
 install_lib_bin-for-debug :
-	ln -f -s ../src/kan96xx/Doc ${OpenXM_lib}/sm1
-	${RM} -f ${OpenXM_lib}/sm1/bin/ox*
-	ln -f -s ../../../../bin/ox ${OpenXM_lib}/sm1/bin/ox
-	ln -f -s ../../../../bin/oxlog ${OpenXM_lib}/sm1/bin/oxlog
-	ln -f -s ../../../../bin/ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1
-	ln -f -s ./ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_forAsir
-	ln -f -s ./ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_gnuplot
-	ln -f -s ./ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_phc
-	ln -f -s ./ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_tigers
-	ln -f -s ./ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_basicCD
+	ln -f -s ../src/kan96xx/Doc ${OpenXM_lib_for_debug}/sm1
+	${RM} -f ${OpenXM_lib_for_debug}/sm1/bin/ox*
+	ln -f -s ../../../../bin/ox ${OpenXM_lib_for_debug}/sm1/bin/ox
+	ln -f -s ../../../../bin/oxlog ${OpenXM_lib_for_debug}/sm1/bin/oxlog
+	ln -f -s ../../../../bin/ox_sm1 ${OpenXM_lib_for_debug}/sm1/bin/ox_sm1
+	ln -f -s ./ox_sm1 ${OpenXM_lib_for_debug}/sm1/bin/ox_sm1_forAsir
+	ln -f -s ./ox_sm1 ${OpenXM_lib_for_debug}/sm1/bin/ox_sm1_gnuplot
+	ln -f -s ./ox_sm1 ${OpenXM_lib_for_debug}/sm1/bin/ox_sm1_phc
+	ln -f -s ./ox_sm1 ${OpenXM_lib_for_debug}/sm1/bin/ox_sm1_tigers
+	ln -f -s ./ox_sm1 ${OpenXM_lib_for_debug}/sm1/bin/ox_sm1_basicCD
 install: install-exec
 install-exec: copy-kan-lib install_lib_bin
 	install ox ox_sm1 oxlog ox100start ox_texmacs ${OpenXM_bin}
@@ -191,6 +195,7 @@ copy-kan-lib : clean-for-install
 	touch ${OpenXM_lib}/sm1/DO_NOT_EDIT_THIS_DIRECTORY._ALL_FILES_ARE_COPIED_FROM_kan96xx_Doc
 	-if [  "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \
 	  cp ${Kan96xx}/Doc/* ${OpenXM_lib}/sm1 ; \
+	  cp -r ${Kan96xx}/Doc/Resource ${OpenXM_lib}/sm1 ; \
 	  mkdir ${OpenXM_lib}/sm1/bin ; \
 	else \
 	  cp -r ${Kan96xx}/Doc/* ${OpenXM_lib}/sm1 ; \