===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.32
diff -u -p -r1.29 -r1.32
--- OpenXM_contrib2/asir2000/Makefile.am	2009/02/04 12:10:07	1.29
+++ OpenXM_contrib2/asir2000/Makefile.am	2009/02/13 13:21:19	1.32
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.28 2008/03/19 07:05:55 ohara Exp $
+## $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.31 2009/02/06 10:11:11 ohara Exp $
 
 AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
 if USE_PLOT
@@ -12,7 +12,7 @@ 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
@@ -27,10 +27,9 @@ 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@
+           @GCINC@ @PARIINC@ @X_CFLAGS@
 
-GLIB  = libasir-gc.a
+GLIB  = @ASIR_GCLIB@
 ALIB  = asm/libasm.a
 BLIB  = builtin/libfunc.a
 ELIB  = engine/libca.a
@@ -39,13 +38,13 @@ IOLIB = io/libio.a
 PLIB  = parse/libparse.a
 
 ASIRLIB  = ${BLIB} ${PLIB} ${IOLIB} ${PLLIB} ${ELIB} ${FLIB} ${ALIB}
-LIBS     = @LIBS@ @PARILIB@ @MPILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} -lm ${EXTRALIBS}
+LIBS     = @LIBS@ @GCLIB@ @PARILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} -lm ${EXTRALIBS}
 # EXTRALIBS = @EXTRALIBS@
 
 umain.o: parse/main.c
 	${COMPILE} -DUINIT main.c -o umain.o
 
-libasir-gc.a: ${GC_PATCH} parse/gc_risa.c
+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}; \
@@ -71,7 +70,7 @@ libasir-gc.a: ${GC_PATCH} parse/gc_risa.c
 	(cd ${top_srcdir}/${GC}; ${MAKE})
 	cp ${top_srcdir}/${GC}/.libs/libgc.a $@
 
-libasir.a: ${ASIRLIB} ${GLIB}
+libasir.a: ${ASIRLIB} ${GLIB} parse/gc_risa.c
 	-mkdir ${top_srcdir}/libtmp
 	-rm -f ${top_srcdir}/libtmp/*  ${top_srcdir}/$@
 	for i in ${ASIRLIB}; do (cd ${top_srcdir}/libtmp; ar x ../$$i; chmod 644 *) done