===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.48
diff -u -p -r1.30 -r1.48
--- OpenXM_contrib2/asir2000/Makefile.am	2009/02/05 09:01:07	1.30
+++ OpenXM_contrib2/asir2000/Makefile.am	2016/09/22 07:15:33	1.48
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.29 2009/02/04 12:10:07 ohara Exp $
+## $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.47 2015/08/20 08:39:01 ohara Exp $
 
 AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
 if USE_PLOT
@@ -12,36 +12,37 @@ SUBDIRS  = asm builtin engine fft include io lib parse
 asirdir       = ${libdir}/asir
 asir_PROGRAMS = asir
 asir_SOURCES  = parse/main.c
-asir_LDADD    = libasir.a libasir-gc.a
+asir_LDADD    = libasir.a @ASIR_GCLIB@
 CLEANFILES    = ${asir_LDADD} asir-openxm-${VERSION}.tgz
 
-GC_TAR_GZ     = ${GC}.tar.gz
-if USE_GC7
-GC_PATCH      = gc-7.0-risa.diff
-else
-GC_PATCH      = gc6.diff gc6-risa.diff
-endif
-GC_DISTDIR    = @GC_DISTDIR@
-GC_MASTER_SITE=ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/
+GC_TAR_GZ     = gc-7.4.2.tar.gz
+GC_PATCH      = gc-7.diff gc-7.0-risa.diff
+LIB_ATOMIC     = libatomic_ops-7.4.0
+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 \
-           -I${top_srcdir}/${GC}/include \
-           @PARIINC@ @MPIINC@ @X_CFLAGS@
+AM_CPPFLAGS = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \
+           -I${prefix}/include @GCINC@ @PARIINC@ @X_CFLAGS@
 
-GLIB  = libasir-gc.a
+GLIB  = @ASIR_GCLIB@
 ALIB  = asm/libasm.a
 BLIB  = builtin/libfunc.a
 ELIB  = engine/libca.a
 FLIB  = fft/libdft.a
 IOLIB = io/libio.a
 PLIB  = parse/libparse.a
+GMPLIB = -L ${libdir} @GMPLIB@
 
 ASIRLIB  = ${BLIB} ${PLIB} ${IOLIB} ${PLLIB} ${ELIB} ${FLIB} ${ALIB}
-LIBS     = @LIBS@ @PARILIB@ @MPILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} -lm ${EXTRALIBS}
+LIBS     = @LIBS@ @GCLIB@ @PARILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} ${GMPLIB} -lm @WSLIB@ ${EXTRALIBS}
 # EXTRALIBS = @EXTRALIBS@
 
+all-recursive: ${GLIB}
+
 umain.o: parse/main.c
 	${COMPILE} -DUINIT main.c -o umain.o
 
@@ -49,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 ; \
@@ -126,3 +129,9 @@ tarball:
 	DESTDIR=`cd tmp; pwd` ${MAKE} install-openxm
 	(cd tmp${prefix}; tar cf - * ) | gzip -c > asir-openxm-${VERSION}.tgz
 	-rm -rf tmp
+
+clean-gc:
+	-rm -rf ${top_srcdir}/.gc_*_done ${top_srcdir}/${GC}
+	-rm -rf ${top_srcdir}/autom4te.cache
+
+distclean-recursive: clean-gc