=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- OpenXM_contrib2/asir2000/Makefile.in 2003/03/19 07:12:02 1.14 +++ OpenXM_contrib2/asir2000/Makefile.in 2003/03/20 02:02:39 1.15 @@ -113,14 +113,13 @@ FLIB = fft/libdft.a IOLIB = io/libio.a PLIB = parse/libparse.a -# The ASIRLIB cannot be rearrenged. ASIRLIB = ${BLIB} ${PLIB} ${IOLIB} ${PLLIB} ${ELIB} ${FLIB} ${ALIB} LIBS = @LIBS@ @PARILIB@ @MPILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} -lm ${EXTRALIBS} # EXTRALIBS = @EXTRALIBS@ bin_PROGRAMS = asir asir_SOURCES = parse/main.c -asir_LDADD = ${ASIRLIB} ${GLIB} +asir_LDADD = libasir.a libasir-gc.a noinst_LIBRARIES = libasir.a libasir-gc.a CLEANFILES = libasir.a libasir-gc.a asir${EXEEXT} @@ -144,12 +143,7 @@ PROGRAMS = $(bin_PROGRAMS) am_asir_OBJECTS = main.$(OBJEXT) asir_OBJECTS = $(am_asir_OBJECTS) -@USE_PLOT_TRUE@asir_DEPENDENCIES = builtin/libfunc.a parse/libparse.a \ -@USE_PLOT_TRUE@ io/libio.a plot/libplot.a engine/libca.a \ -@USE_PLOT_TRUE@ fft/libdft.a asm/libasm.a libasir-gc.a -@USE_PLOT_FALSE@asir_DEPENDENCIES = builtin/libfunc.a parse/libparse.a \ -@USE_PLOT_FALSE@ io/libio.a engine/libca.a fft/libdft.a \ -@USE_PLOT_FALSE@ asm/libasm.a libasir-gc.a +asir_DEPENDENCIES = libasir.a libasir-gc.a asir_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ @@ -511,7 +505,7 @@ uninstall-info: uninstall-info-recursive umain.o: parse/main.c ${COMPILE} -DUINIT main.c -o umain.o -libasir-gc.a: parse/gc_risa.o +libasir-gc.a: -if [ "${USE_GC_ZEROPAGE}" = yes \ -a ! -f ${top_srcdir}/gc/.patch_gc_zeropage_done ]; then \ (cd ${top_srcdir}/gc; patch < ../gc_zeropage.diff) ; \ @@ -526,9 +520,10 @@ libasir-gc.a: parse/gc_risa.o touch ${top_srcdir}/gc/.configure_done ; \ fi (cd ${top_srcdir}/gc; ${MAKE}) - cp ${top_srcdir}/gc/.libs/libgc.a ${top_srcdir}/${GLIB} - ${AR} q ${top_srcdir}/${GLIB} ${top_srcdir}/parse/gc_risa.o - ${RANLIB} ${top_srcdir}/${GLIB} + 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} libasir.a: ${ASIRLIB} -mkdir ${top_srcdir}/libtmp