diff options
| -rw-r--r-- | libgfortran/ChangeLog | 7 | ||||
| -rw-r--r-- | libgfortran/Makefile.am | 3 | ||||
| -rw-r--r-- | libgfortran/Makefile.in | 15 |
3 files changed, 20 insertions, 5 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 94c5c67..210a372 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2008-02-25 Janne Blomqvist <jb@gcc.gnu.org> + + PR fortran/29549 + * Makefile.am: Add -fcx-fortran-rules to AM_CFLAGS for all of + libgfortran. + * Makefile.in: Regenerated. + 2008-02-25 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> * m4/ifunction_logical.m4: Add casts to get rid of warnings. diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index 489f9ed..16348c4 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am @@ -28,6 +28,9 @@ AM_CPPFLAGS = -iquote$(srcdir)/io -I$(srcdir)/$(MULTISRCTOP)../gcc \ -I$(srcdir)/$(MULTISRCTOP)../gcc/config \ -I$(MULTIBUILDTOP)../../$(host_subdir)/gcc -D_GNU_SOURCE +# Fortran rules for complex multiplication and division +AM_CFLAGS += -fcx-fortran-rules + gfor_io_src= \ io/close.c \ io/file_pos.c \ diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in index 07feb5d..91ab7a2 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in @@ -730,7 +730,9 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CFLAGS = @AM_CFLAGS@ + +# Fortran rules for complex multiplication and division +AM_CFLAGS = @AM_CFLAGS@ -fcx-fortran-rules AM_FCFLAGS = @AM_FCFLAGS@ AR = @AR@ AS = @AS@ @@ -789,13 +791,9 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_ct_FC = @ac_ct_FC@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ @@ -812,6 +810,9 @@ build_os = @build_os@ build_subdir = @build_subdir@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ enable_shared = @enable_shared@ enable_static = @enable_static@ exec_prefix = @exec_prefix@ @@ -822,11 +823,13 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_subdir = @host_subdir@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ mandir = @mandir@ @@ -836,8 +839,10 @@ oldincludedir = @oldincludedir@ onestep = @onestep@ onestep_FALSE = @onestep_FALSE@ onestep_TRUE = @onestep_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ |