From 4e16d3aafa8d7b2f15e54b997b022dcd318fe31c Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Mon, 18 Jun 2012 21:19:33 +0000 Subject: [PATCH] [cantera2.0]: partial fix to problem ray identified, followup coming in a few minutes --- ext/Makefile.am | 5 ----- ext/f2c_libs/Makefile.am | 2 +- ext/f2c_math/Makefile.am | 7 ++++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ext/Makefile.am b/ext/Makefile.am index 1bbdd8013..3e7af9b78 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -1,7 +1,2 @@ SUBDIRS = libexecstream f2c_math f2c_libs f2c_blas f2c_lapack cvode -# header file accumulation -all: - @echo copying headers $< - cp -p f2c_libs/sysdep1.h0 f2c_libs/sysdep1.h - cp -p f2c_libs/signal1.h0 f2c_libs/signal1.h diff --git a/ext/f2c_libs/Makefile.am b/ext/f2c_libs/Makefile.am index 12f6fa2c6..151537495 100644 --- a/ext/f2c_libs/Makefile.am +++ b/ext/f2c_libs/Makefile.am @@ -1,7 +1,7 @@ cc_sources = abort_.c c_log.c d_atn2.c dfe.c d_prod.c \ due.c exit_.c getenv_.c hl_le.c i_dim.c \ inquire.c lread.c pow_ii.c r_acos.c \ - r_dim.c r_nint.c r_tan.c signbit.c \ + r_dim.c r_nint.c r_tan.c \ uninit.c z_abs.c close.c \ d_cnjg.c d_imag.c d_sign.c ef1asc_.c \ f77_aloc.c h_abs.c hl_lt.c i_dnnt.c \ diff --git a/ext/f2c_math/Makefile.am b/ext/f2c_math/Makefile.am index 72b8e6a11..fbafff1ba 100644 --- a/ext/f2c_math/Makefile.am +++ b/ext/f2c_math/Makefile.am @@ -46,6 +46,7 @@ __top_builddir__build_lib_libctmath_includedir = $(prefix)/include CLEANFILES = *.o # header file accumulation -#all: -# @echo copying headers $< -# cp -p *.h $(top_builddir)/build/include/ +all: + @echo copying headers $< + cp -p ../f2c_libs/sysdep1.h0 ../f2c_libs/sysdep1.h + cp -p ../f2c_libs/signal1.h0 ../f2c_libs/signal1.h