=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.in,v retrieving revision 1.32 retrieving revision 1.36 diff -u -p -r1.32 -r1.36 --- OpenXM_contrib2/asir2000/Makefile.in 2008/03/19 07:05:55 1.32 +++ OpenXM_contrib2/asir2000/Makefile.in 2009/02/13 13:21:19 1.36 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -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@ @@ -202,6 +203,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies 1.5 @@ -211,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 @@ -219,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 @@ -387,8 +388,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -413,8 +414,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -424,13 +425,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -501,6 +501,10 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -527,6 +531,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -682,8 +688,8 @@ uninstall-am: uninstall-asirPROGRAMS .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-asirPROGRAMS \ clean-generic ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-compile distclean-generic distclean-tags \ + dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-compile distclean-generic distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ html-am info info-am install install-am install-asirPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ @@ -701,7 +707,7 @@ uninstall-am: uninstall-asirPROGRAMS 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}; \ @@ -725,22 +731,16 @@ libasir-gc.a: ${GC_PATCH} parse/gc_risa.c touch ${top_srcdir}/${GC}/.configure_done ; \ fi (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} + cp ${top_srcdir}/${GC}/.libs/libgc.a $@ -libasir.a: ${ASIRLIB} +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 + (cd ${top_srcdir}/parse; ${MAKE} gc_risa.o; cp gc_risa.o ../libtmp) (cd ${top_srcdir}/libtmp; ${AR} cq ../$@ *.o) (cd ${top_srcdir}; ${RANLIB} $@) -rm -rf ${top_srcdir}/libtmp - -#asir.o: umain.o ${ASIRLIB} ${GLIB} -# -rm $@ -# ld -r $@ umain.o ${ASIRLIB} ${GLIB} ${LIBS} ${EXTRALIBS} install-libasir: libasir.a mkdir -p ${DESTDIR}${libdir}