=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.in,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- OpenXM_contrib2/asir2000/Makefile.in 2005/07/12 12:57:54 1.25 +++ OpenXM_contrib2/asir2000/Makefile.in 2005/07/12 14:47:13 1.26 @@ -93,6 +93,7 @@ am__quote = @am__quote@ asm_obj = @asm_obj@ install_sh = @install_sh@ libasir_postfix = @libasir_postfix@ +GC_DISTDIR = @GC_DISTDIR@ AUTOMAKE_OPTIONS = foreign no-dependencies 1.5 @USE_PLOT_TRUE@PLOTDIR = plot @@ -107,11 +108,14 @@ asir_SOURCES = parse/main.c asir_LDADD = libasir.a libasir-gc.a CLEANFILES = ${asir_LDADD} asir-openxm-${VERSION}.tgz -gc = gc6.5 +GC = gc6.5 +GC_TAR_GZ = ${GC}.tar.gz +GC_MASTER_SITE = ftp://ftp.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 \ + -I${top_srcdir}/${GC}/include \ @PARIINC@ @MPIINC@ @X_CFLAGS@ @@ -489,36 +493,42 @@ uninstall-info: uninstall-info-recursive umain.o: parse/main.c ${COMPILE} -DUINIT main.c -o umain.o -libasir-gc.a: ${gc}.tar.gz ${gc}-risa.diff parse/gc_risa.c - -if [ ! -f ${top_srcdir}/.gc-risa_done ]; then \ - (cd ${top_srcdir}; tar xzvf ${gc}.tar.gz; patch -p0 < ${gc}-risa.diff) ; \ - touch ${top_srcdir}/.gc-risa_done ; \ +libasir-gc.a: ${GC}-risa.diff parse/gc_risa.c + -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}; \ + 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}; patch -p0 < ${GC}-risa.diff) ; \ + touch ${top_srcdir}/.gc_risa_done ; \ + fi -if [ "${USE_GC_ZEROPAGE}" = yes \ - -a ! -f ${top_srcdir}/${gc}/.patch_gc_zeropage_done ]; then \ - (cd ${top_srcdir}/${gc}; patch < ../gc_zeropage.diff) ; \ - touch ${top_srcdir}/${gc}/.patch_gc_zeropage_done ; \ + -a ! -f ${top_srcdir}/${GC}/.patch_gc_zeropage_done ]; then \ + (cd ${top_srcdir}/${GC}; patch < ../gc_zeropage.diff) ; \ + touch ${top_srcdir}/${GC}/.patch_gc_zeropage_done ; \ fi -if [ "${USE_GC_INTERIX}" = yes \ - -a ! -f ${top_srcdir}/${gc}/.patch_gc_interix_done ]; then \ - (cd ${top_srcdir}/${gc}; patch -p0 < ../gc_interix.diff) ; \ - touch ${top_srcdir}/${gc}/.patch_gc_interix_done ; \ + -a ! -f ${top_srcdir}/${GC}/.patch_gc_interix_done ]; then \ + (cd ${top_srcdir}/${GC}; patch -p0 < ../gc_interix.diff) ; \ + touch ${top_srcdir}/${GC}/.patch_gc_interix_done ; \ fi -if [ "${USE_GC_SPARC64}" = yes \ - -a ! -f ${top_srcdir}/${gc}/.patch_gc_sparc64_done ]; then \ - (cd ${top_srcdir}/${gc}; patch -p0 < ../gc_sparc64.diff) ; \ - touch ${top_srcdir}/${gc}/.patch_gc_sparc64_done ; \ + -a ! -f ${top_srcdir}/${GC}/.patch_gc_sparc64_done ]; then \ + (cd ${top_srcdir}/${GC}; patch -p0 < ../gc_sparc64.diff) ; \ + touch ${top_srcdir}/${GC}/.patch_gc_sparc64_done ; \ fi - -if [ ! -f ${top_srcdir}/${gc}/.configure_done ]; then \ + -if [ ! -f ${top_srcdir}/${GC}/.configure_done ]; then \ if [ -n "${host_alias}" ]; then \ - (cd ${top_srcdir}/${gc}; ./configure --host=${host_alias} --disable-threads) ; \ + (cd ${top_srcdir}/${GC}; ./configure --host=${host_alias} --disable-threads) ; \ else \ - (cd ${top_srcdir}/${gc}; ./configure --disable-threads) ; \ + (cd ${top_srcdir}/${GC}; ./configure --disable-threads) ; \ fi ; \ - touch ${top_srcdir}/${gc}/.configure_done ; \ + touch ${top_srcdir}/${GC}/.configure_done ; \ fi - (cd ${top_srcdir}/${gc}; ${MAKE}) - cp ${top_srcdir}/${gc}/.libs/libgc.a ${GLIB} + (cd ${top_srcdir}/${GC}; ${MAKE}) + cp ${top_srcdir}/${GC}/.libs/libgc.a ${GLIB} (cd ${top_srcdir}/parse; ${MAKE} gc_risa.o) ${AR} q ${GLIB} ${top_srcdir}/parse/gc_risa.o ${RANLIB} ${GLIB}