===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/Makefile.in,v
retrieving revision 1.23
retrieving revision 1.26
diff -u -p -r1.23 -r1.26
--- OpenXM/src/kxx/Makefile.in	2003/09/02 03:24:51	1.23
+++ OpenXM/src/kxx/Makefile.in	2003/09/08 01:34:27	1.26
@@ -1,4 +1,4 @@
-##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.22 2003/08/22 23:56:28 takayama Exp $
+##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.25 2003/09/08 01:22:56 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@
@@ -118,18 +118,18 @@ distclean : clean clean-for-install
 
 ## install targets.
 install-for-debug : clean-for-install install_lib_bin-for-debug
-	${RM} -f ../bin/ox ../bin/ox_sm1 ../bin/oxlog ../bin/ox100start
-	ln -f -s  ../src/kxx/ox ../bin/ox
-	ln -f -s  ../src/kxx/ox_sm1 ../bin/ox_sm1
-	ln -f -s  ../src/kxx/oxlog ../bin/oxlog
-	ln -f -s  ../src/kxx/ox100start ../bin/ox100start
+	${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
 
 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 ../../../../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
@@ -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