===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/Makefile.in,v
retrieving revision 1.25
retrieving revision 1.34
diff -u -p -r1.25 -r1.34
--- OpenXM/src/kxx/Makefile.in	2003/09/08 01:22:56	1.25
+++ OpenXM/src/kxx/Makefile.in	2004/06/25 04:37:54	1.34
@@ -1,5 +1,4 @@
-##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.24 2003/09/03 00:41:07 takayama Exp $
-#
+##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.33 2004/06/25 04:25:48 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 ${OpenXM_lib}/libgmp.a ${OpenXM_lib}/libgc.a
+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@
@@ -36,14 +40,14 @@ RM=rm
 ### Set the server name in oxmain.c if you do not use the environmental
 ### variable LOAD_SM1_PATH.  cf. $Kan96xx/lib/ox.sm1
 
-all : configure ox ox_sm1  oxlog ox100start
+all : configure ox ox_sm1  oxlog ox100start ox_texmacs
 
 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
@@ -108,36 +112,39 @@ testclient2 : testclient2.o ${Kan96xx}/Kan/kanlib.a ox
 	${CC} ${CFLAGS} -I${Kan96xx}/Kan testclient2.c -o testclient2  ${LIBS} ${KANLIB}
 testclient2.o: testclient.c ox_kan.h
 
+ox_texmacs: ox_texmacs.o ${Kan96xx}/Kan/kanlib.a
+	${CC}  ${STATIC_LINK_FLAG} ${CFLAGS} ox_texmacs.o -o ox_texmacs  ${LIBS} ${KANLIB}
 
 clean-done: 
 	-${RM} -f .configure_done
 clean: clean-done
-	-${RM} -f ox testclient ox_null ox_sm1 testclient2 core *.o a.out *.dvi *.aux openxxx.log  ox_sm1 oxlog *~ openxm-eg.tex openxm-jp.tex ox100start
+	-${RM} -f ox testclient ox_null ox_sm1 testclient2 core *.o a.out *.dvi *.aux openxxx.log  ox_sm1 oxlog *~ openxm-eg.tex openxm-jp.tex ox100start .prog.ox100bin* .in.ox100bin* ox_texmacs
 distclean : clean clean-for-install
 	/bin/rm -f config.status config.cache config.log
 
 ## 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
-	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
+	${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 ${OpenXM_bin}
+	install ox ox_sm1 oxlog ox100start ox_texmacs ${OpenXM_bin}
 install_lib_bin:
 	if [  "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \
 	  make install_lib_bin_windows ; \
@@ -197,7 +204,7 @@ copy-kan-lib : clean-for-install
 	cp ${Kan96xx}/Kan/var.sm1 ${OpenXM_lib}/sm1
 clean-for-install :
 	-/bin/rm -rf ${OpenXM_lib}/sm1
-	-/bin/rm -rf ${OpenXM_bin}/oxlog ${OpenXM_bin}/ox_sm1 ${OpenXM_bin}/ox   ${OpenXM_bin}/ox100start
+	-/bin/rm -rf ${OpenXM_bin}/oxlog ${OpenXM_bin}/ox_sm1 ${OpenXM_bin}/ox   ${OpenXM_bin}/ox100start ${OpenXM_bin}/ox_texmacs