===================================================================
RCS file: /home/cvs/OpenXM/src/k097/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.11
diff -u -p -r1.3 -r1.11
--- OpenXM/src/k097/Makefile.in	2004/02/28 17:07:12	1.3
+++ OpenXM/src/k097/Makefile.in	2021/03/24 05:00:11	1.11
@@ -1,4 +1,4 @@
-# $OpenXM: OpenXM/src/k097/Makefile.in,v 1.2 2003/09/08 01:22:55 takayama Exp $
+# $OpenXM: OpenXM/src/k097/Makefile.in,v 1.10 2020/10/07 23:53:25 takayama Exp $
 #
 #  Depends on  all-kan96xx [source tree of kan96xx at ${Kan96xx} is required]
 #              install-gmp, install-gc, install-util
@@ -8,32 +8,39 @@
 #  install-exec: all install-lib 
 #  install-for-debug
 #
-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
+#
 BDATE =19970416
 LOAD_K_PATH ='"/usr/local/lib/k0/"'
 LOAD_SM1_PATH2 ='"/this_directory_does_not_exists/"'
-CFLAGS= @CFLAGS@ -D_BSD_SOURCE -g -DLOAD_K_PATH=${LOAD_K_PATH} -DLOAD_SM1_PATH2=${LOAD_SM1_PATH2}
+CFLAGS= @CFLAGS@ -D_BSD_SOURCE -D_DEFAULT_SOURCE -g -DLOAD_K_PATH=${LOAD_K_PATH} -DLOAD_SM1_PATH2=${LOAD_SM1_PATH2} -fcommon
 #STATIC_LINK_FLAG=-static
 STATIC_LINK_FLAG=
 ## Kan source.  kan sources must be built up by hand.
-Kan96xx=${OpenXM_HOME}/src/kan96xx
+Kan96xx=${OpenXM_HOME_debug}/src/kan96xx
 MYYACC = bison
 YACCPREFIX = -p KC
 RM=rm
 Kan96xx_Kan=${Kan96xx}/Kan
 PATHFINDER=-lox_pathfinder
-LIBGMP=-lgmp 
-GC = -lgc 
 CC=@CC@
 LIBS=@LIBS@ -L${OpenXM_lib}
+# new
+KANLIB_SHARED = ${Kan96xx}/Kan/kanlib.a -L${OpenXM_lib_debug} -lgmp -lgc
+KANLIB_STATIC = ${Kan96xx}/Kan/kanlib.a -L${OpenXM_lib_debug} ${OpenXM_lib}/libgmp.a ${OpenXM_lib}/libgc.a -Wl,-no_pie
+KANLIB=@KANLIB@
 
 all : configure d0 k0 ox_k0
 configure: Makefile
 
 Makefile: Makefile.in
-	./configure
+	(rm -f .configure_done ; ./make-configure)
 
 .c.o:
 	${CC}  ${CFLAGS} -I${OpenXM_include} -c  $<
@@ -57,7 +64,7 @@ Stable/sm1symbo.h : Stable/reserved.txt
 	(cd Stable; make)
 
 clean:
-	rm -f simple d0 k0 test0 *.o *~  simple.output asir-tmp.t asir-tmp.tt asir-tmp-out.t asir-tmp-out.tt k2
+	rm -f simple d0 k0 test0 *.o *~  simple.output asir-tmp.t asir-tmp.tt asir-tmp-out.t asir-tmp-out.tt k2 .*_done ox_k0
 	(cd Stable; make clean)
 	(cd try; make clean)
 ##	rm -f simple.tab.c simple.tab.h
@@ -81,12 +88,12 @@ slib.sm1: slib.k
 KXX = simple.tab.o d.o ki.o dic.o
 
 k0:  k0.o $(KXX) ${Kan96xx_Kan}/kanlib.a ${Kan96xx_Kan}/lookup.h
-	${CC} ${CFLAGS}  -I${OpenXM_include} -I${Kan96xx_Kan} -o k0 k0.o $(KXX)  ${Kan96xx_Kan}/kanlib.a ${LIBS} $(LIBGMP) $(GC)
+	${CC} ${CFLAGS}  -I${OpenXM_include} -I${Kan96xx_Kan} -o k0 k0.o $(KXX)  ${KANLIB}
 
-k0.o: k2.c
+k0.o: k2.c ki.h
 	${CC} -c ${CFLAGS}  -I${OpenXM_include} -I${Kan96xx_Kan} -o k0.o k2.c
 
-ki.o: ki.c
+ki.o: ki.c ki.h
 	${CC} -c ${CFLAGS}  -I${OpenXM_include} -I${Kan96xx_Kan} -o ki.o ki.c
 
 dic.o: dic.c d.h
@@ -100,30 +107,44 @@ ${Kan96xx_Kan}/lookup.h :
 
 
 ox_k0: ox_k0.o k0 sm1sm.o
-	${CC} ${STATIC_LINK_FLAG} ${CFLAGS}  -I${OpenXM_include} -I${Kan96xx_Kan} -o ox_k0 ox_k0.c sm1sm.c $(KXX)  ${Kan96xx_Kan}/kanlib.a ${LIBS} ${LIBGMP} ${GC}
-ox_k0.o: ox_k0.c
-sm1sm.o: sm1sm.c
+	${CC} ${STATIC_LINK_FLAG} ${CFLAGS}  -I${OpenXM_include} -I${Kan96xx_Kan} -o ox_k0 ox_k0.c sm1sm.c $(KXX)  ${KANLIB}
+ox_k0.o: ox_k0.c ki.h ox_k0.h
+sm1sm.o: sm1sm.c ox_k0.h
 ##########  
 ## A sample to compilation:  source is test0.c, output is test0
 test0:  test0.c  $(KXX) ${Kan96xx_Kan}/kanlib.a ${Kan96xx_Kan}/lookup.h
-	${CC} ${CFLAGS}  -I${OpenXM_include} -I${Kan96xx_Kan} -o test0 test0.c $(KXX) ${Kan96xx_Kan}/kanlib.a ${LIBS} ${LIBGMP} ${GC}
+	${CC} ${CFLAGS}  -I${OpenXM_include} -I${Kan96xx_Kan} -o test0 test0.c $(KXX) ${KANLIB}
 
 clean-for-install:
 	${RM} -f ${OpenXM_HOME}/bin/k0 ${OpenXM_HOME}/bin/k0.exe ${OpenXM_HOME}/bin/d0 ${OpenXM_HOME}/bin/d0.exe ${OpenXM_HOME}/bin/ox_k0 ${OpenXM_HOME}/bin/ox_k0.exe ${OpenXM_HOME}/lib/sm1/bin/ox_k0 ${OpenXM_HOME}/lib/sm1/bin/ox_k0.exe
+	${RM} -f ${OpenXM_HOME_debug}/bin/k0 ${OpenXM_HOME_debug}/bin/k0.exe ${OpenXM_HOME_debug}/bin/d0 ${OpenXM_HOME_debug}/bin/d0.exe ${OpenXM_HOME_debug}/bin/ox_k0 ${OpenXM_HOME_debug}/bin/ox_k0.exe ${OpenXM_HOME_debug}/lib/sm1/bin/ox_k0 ${OpenXM_HOME_debug}/lib/sm1/bin/ox_k0.exe
 
 install: install-exec
 install-exec: all clean-for-install install-lib
 	install -c -s k0  ${OpenXM_HOME}/bin
 	install -c -s d0  ${OpenXM_HOME}/bin
 	install -c -s ox_k0 ${OpenXM_HOME}/bin
-	install -c -s ox_k0 ${OpenXM_HOME}/lib/sm1/bin
+	rm -f ${OpenXM_HOME}/lib/sm1/bin/ox_k0
+	if [  "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \
+	  make install-gen-link-windows ; \
+	elif [  "`uname | sed -e 's/_.*$$//'`" = "MSYS" ];  then \
+	  make install-gen-link-windows ; \
+	else \
+	  make install-gen-link ; \
+	fi
 
+install-gen-link: 
+	( cd ${OpenXM_HOME}/lib/sm1/bin ; ln -s ../../../../bin/ox_k0 ox_k0)
+install-gen-link-windows: 
+	( cp ox_k0 ${OpenXM_HOME}/lib/sm1/bin )
+
 install-for-debug: clean-for-install all install-lib-for-debug
-	(cd ${OpenXM_HOME}/bin ; ln -s ../src/k097/k0 k0)
-	(cd ${OpenXM_HOME}/bin ; ln -s ../src/k097/d0 d0)
-	(cd ${OpenXM_HOME}/bin ; ln -s ../src/k097/ox_k0 ox_k0)
-	(cd ${OpenXM_HOME}/lib/sm1/bin ; ln -s ../../../../src/k097/ox_k0 ox_k0)
 
+	(cd ${OpenXM_HOME_debug}/bin ; ln -s ../src/k097/k0 k0)
+	(cd ${OpenXM_HOME_debug}/bin ; ln -s ../src/k097/d0 d0)
+	(cd ${OpenXM_HOME_debug}/bin ; ln -s ../src/k097/ox_k0 ox_k0)
+	(cd ${OpenXM_HOME_debug}/lib/sm1/bin ; ln -s ../../../../src/k097/ox_k0 ox_k0)
+
 install-lib:
 	${RM} -rf ${OpenXM_lib}/k097
 	mkdir ${OpenXM_lib}/k097
@@ -131,5 +152,9 @@ install-lib:
 	cp -rf *.sm1 *.k *.kk debug lib ${OpenXM_lib}/k097
 
 install-lib-for-debug :
-	${RM} -rf ${OpenXM_lib}/k097
-	ln -s ../src/k097 ${OpenXM_lib}/k097
+	${RM} -rf ${OpenXM_lib_debug}/k097
+	ln -s ../src/k097 ${OpenXM_lib_debug}/k097
+
+distclean: clean
+	rm -f .configure_done
+