=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.in,v retrieving revision 1.33 retrieving revision 1.38 diff -u -p -r1.33 -r1.38 --- OpenXM_contrib2/asir2000/Makefile.in 2009/02/04 12:10:07 1.33 +++ OpenXM_contrib2/asir2000/Makefile.in 2009/03/04 09:15:36 1.38 @@ -52,7 +52,7 @@ asirPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(asir_PROGRAMS) am_asir_OBJECTS = main.$(OBJEXT) asir_OBJECTS = $(am_asir_OBJECTS) -asir_DEPENDENCIES = libasir.a libasir-gc.a +asir_DEPENDENCIES = libasir.a DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = am__depfiles_maybe = @@ -87,6 +87,7 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +ASIR_GCLIB = @ASIR_GCLIB@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -106,6 +107,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FEPLIB = @FEPLIB@ GC = @GC@ +GCINC = @GCINC@ +GCLIB = @GCLIB@ GC_CONFIGURE_ARGS = @GC_CONFIGURE_ARGS@ GC_DISTDIR = @GC_DISTDIR@ GREP = @GREP@ @@ -117,14 +120,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LAPACKLIB = @LAPACKLIB@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ @PARILIB@ @MPILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} -lm ${EXTRALIBS} +LIBS = @LIBS@ @GCLIB@ @PARILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} -lm ${EXTRALIBS} LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MPIINC = @MPIINC@ -MPILIB = @MPILIB@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -212,7 +213,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies 1.5 SUBDIRS = asm builtin engine fft include io lib parse ${PLOTDIR} asirdir = ${libdir}/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 @USE_GC7_FALSE@GC_PATCH = gc6.diff gc6-risa.diff @@ -220,10 +221,9 @@ GC_TAR_GZ = ${GC}.tar.gz GC_MASTER_SITE = ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/ OX_FETCH = ${bindir}/oxfetch.sh 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 @@ -704,10 +704,12 @@ uninstall-am: uninstall-asirPROGRAMS # EXTRALIBS = @EXTRALIBS@ +all-recursive: ${GLIB} + 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}; \ @@ -733,7 +735,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 @@ -788,6 +790,12 @@ 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 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: