===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.52
diff -u -p -r1.43 -r1.52
--- OpenXM_contrib2/asir2000/Makefile.am	2015/08/04 06:20:44	1.43
+++ OpenXM_contrib2/asir2000/Makefile.am	2021/03/24 18:27:09	1.52
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.42 2015/02/21 06:20:54 ohara Exp $
+## $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.51 2019/03/26 08:10:13 ohara Exp $
 
 AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
 if USE_PLOT
@@ -9,21 +9,23 @@ endif
 
 SUBDIRS  = asm builtin engine fft include io lib parse ${PLOTDIR}
 
-asirdir       = ${libdir}/asir
+asirdir       = ${libdir}/asir2000
 asir_PROGRAMS = asir
 asir_SOURCES  = parse/main.c
 asir_LDADD    = libasir.a @ASIR_GCLIB@
 CLEANFILES    = ${asir_LDADD} asir-openxm-${VERSION}.tgz
 
-GC_TAR_GZ     = gc-7.2b.tar.gz
+GC_TAR_GZ     = gc-7.4.18.tar.gz
 GC_PATCH      = gc-7.diff gc-7.0-risa.diff
+LIB_ATOMIC     = libatomic_ops-7.4.14
+LIB_ATOMIC_TAR_GZ     = ${LIB_ATOMIC}.tar.gz
 #GC_TAR_GZ     = ${GC}.tar.gz
 #GC_PATCH      = gc6.diff gc6-risa.diff
 GC_MASTER_SITE=http://www.math.kobe-u.ac.jp/pub/OpenXM/misc/
 OX_FETCH      = ${bindir}/oxfetch.sh
 
 DEFS     = @DEFS@ -DASIR_LIBDIR=\"${asirdir}\"
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \
+AM_CPPFLAGS = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \
            -I${prefix}/include @GCINC@ @PARIINC@ @X_CFLAGS@
 
 GLIB  = @ASIR_GCLIB@
@@ -33,10 +35,10 @@ ELIB  = engine/libca.a
 FLIB  = fft/libdft.a
 IOLIB = io/libio.a
 PLIB  = parse/libparse.a
-GMPLIB = ${libdir}/libmpfr.a ${libdir}/libgmp.a
+GMPLIB = -L${libdir} @GMPLIB@
 
 ASIRLIB  = ${BLIB} ${PLIB} ${IOLIB} ${PLLIB} ${ELIB} ${FLIB} ${ALIB}
-LIBS     = @LIBS@ @GCLIB@ @PARILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} ${GMPLIB} -lm ${EXTRALIBS}
+LIBS     = @LIBS@ @GCLIB@ @PARILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} ${GMPLIB} -lm @WSLIB@ ${EXTRALIBS}
 # EXTRALIBS = @EXTRALIBS@
 
 all-recursive: ${GLIB}
@@ -48,11 +50,13 @@ libasir-gc.a: ${GC_PATCH}
 	-if [ ! -f ${top_srcdir}/.gc_fetch_done ]; then \
 		if [ ! -f ${GC_DISTDIR}/${GC_TAR_GZ} ]; then \
 			${OX_FETCH} ${GC_MASTER_SITE}${GC_TAR_GZ} ${GC_DISTDIR}; \
+			${OX_FETCH} ${GC_MASTER_SITE}${LIB_ATOMIC_TAR_GZ} ${GC_DISTDIR}; \
 		fi ; \
 		touch ${top_srcdir}/.gc_fetch_done ; \
 	fi
 	-if [ ! -f ${top_srcdir}/.gc_risa_done ]; then \
 	    (cd ${top_srcdir}; tar xzvf ${GC_DISTDIR}/${GC_TAR_GZ}) ; \
+	    (cd ${top_srcdir}/${GC}; tar xzvf ${GC_DISTDIR}/${LIB_ATOMIC_TAR_GZ}; mv ${LIB_ATOMIC} libatomic_ops) ; \
 		for i in ${GC_PATCH} ; do \
 	    (cd ${top_srcdir}/${GC}; patch -p1 < ../$$i) ; \
 		done ; \
@@ -81,23 +85,23 @@ libasir.a: ${ASIRLIB} ${GLIB} parse/gc_risa.c
 
 install-libasir: libasir.a
 	mkdir -p ${DESTDIR}${libdir}
-	${INSTALL_DATA} libasir.a ${DESTDIR}${libdir}/libasir${libasir_postfix}.a
+	${INSTALL_DATA} libasir.a ${DESTDIR}${libdir}/libasir2000${libasir_postfix}.a
 
 install-libasir-gc: libasir-gc.a
 	mkdir -p ${DESTDIR}${libdir}
-	${INSTALL_DATA} libasir-gc.a ${DESTDIR}${libdir}/libasir-gc.a
+	${INSTALL_DATA} libasir-gc.a ${DESTDIR}${libdir}/libasir2000-gc.a
 
 install-openxm: asir${EXEEXT} install-libasir install-libasir-gc
 	-mkdir -p ${DESTDIR}${bindir}
-	${INSTALL_PROGRAM} asir ${DESTDIR}${bindir}
+	${INSTALL_PROGRAM} asir2000 ${DESTDIR}${bindir}
 	-mkdir -p ${DESTDIR}${asirdir}
+	${INSTALL_PROGRAM} asir${EXEEXT} ${DESTDIR}${asirdir}
 	(cd ${top_srcdir}/lib; ${MAKE} install-doc install-lib)
-	-rm -f ${DESTDIR}${bindir}/ox_asir${EXEEXT}
-	(cd ${DESTDIR}${bindir} ; ${LN_S} asir${EXEEXT} ox_asir${EXEEXT})
+	-rm -f ${DESTDIR}${bindir}/ox_asir2000${EXEEXT}
+	${LN_S} ${DESTDIR}${asirdir}/asir${EXEEXT} ${DESTDIR}${bindir}/ox_asir2000${EXEEXT}
 	-(cd ${DESTDIR}${asirdir}; \
-    rm -f asir${EXEEXT} ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT})
+    rm -f ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT})
 	(cd ${DESTDIR}${asirdir} ; \
-	${LN_S} ../../bin/asir${EXEEXT} asir${EXEEXT} ; \
 	${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \
 	${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \
 	${LN_S} asir${EXEEXT} ox_plot${EXEEXT})
@@ -113,7 +117,7 @@ install-lib:
 	${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \
 	${LN_S} asir${EXEEXT} ox_plot${EXEEXT})
 	-mkdir -p ${DESTDIR}${bindir}
-	-rm -f ${DESTDIR}${bindir}/asir${EXEEXT}
+	-rm -f ${DESTDIR}${bindir}/asir2000${EXEEXT}
 	(cd ${DESTDIR}${bindir} ; ${LN_S} ../lib/asir/asir${EXEEXT} asir${EXEEXT})
 
 install-doc: