===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.27
diff -u -p -r1.24 -r1.27
--- OpenXM/src/kxx/Makefile.in	2003/09/03 00:41:07	1.24
+++ OpenXM/src/kxx/Makefile.in	2003/11/20 11:41:44	1.27
@@ -1,4 +1,4 @@
-##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.23 2003/09/02 03:24:51 takayama Exp $
+##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.26 2003/09/08 01:34:27 takayama Exp $
 #
 #  Depends on  all-kan96xx [source tree of kan96xx at ${Kan96xx} is required]
 #              install-gmp, install-gc, install-util
@@ -23,7 +23,7 @@ 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
 ########## end of configurations
 CC=@CC@
 RANLIB=@RANLIB@
@@ -112,7 +112,7 @@ testclient2.o: testclient.c ox_kan.h
 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*
 distclean : clean clean-for-install
 	/bin/rm -f config.status config.cache config.log
 
@@ -137,11 +137,7 @@ install_lib_bin-for-debug :
 	ln -f -s ./ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_basicCD
 install: install-exec
 install-exec: copy-kan-lib install_lib_bin
-	if [  "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \
-	  cp -f ox.exe ox_sm1.exe oxlog.exe ox100start.exe ${OpenXM_bin} ; \
-	else \
-	  cp -f ox ox_sm1 oxlog ox100start ${OpenXM_bin} ; \
-	fi
+	install ox ox_sm1 oxlog ox100start ${OpenXM_bin}
 install_lib_bin:
 	if [  "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \
 	  make install_lib_bin_windows ; \
@@ -159,6 +155,18 @@ install_lib_bin_unix: 
 	ln -f -s ./ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_tigers
 	ln -f -s ./ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_basicCD
 install_lib_bin_windows : 
+	-mkdir ${OpenXM_lib}/sm1/bin
+	${RM} -f ${OpenXM_lib}/sm1/bin/ox*
+	install ox ${OpenXM_lib}/sm1/bin/ox
+	install oxlog ${OpenXM_lib}/sm1/bin/oxlog
+	install ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1
+	install ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_forAsir
+	install ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_gnuplot
+	install ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_phc
+	install ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_tigers
+	install ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_basicCD
+#obsolete, it should be removed later
+install_lib_bin_windows_old : 
 	-mkdir ${OpenXM_lib}/sm1/bin
 	${RM} -f ${OpenXM_lib}/sm1/bin/ox*
 	cp ox.exe ${OpenXM_lib}/sm1/bin/ox.exe