Mercurial > octave-nkf

changeset 6137:4fb3f3e3d6bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-11-03 18:19:10 by jwe]
author jwe
date Fri, 03 Nov 2006 18:19:11 +0000
parents bbbe04bacea2
children c5874b47d571
files ChangeLog configure.in libcruft/ChangeLog libcruft/Makefile.in libcruft/Makerules.in liboctave/ChangeLog liboctave/Makefile.in src/ChangeLog src/Makefile.in
diffstat 9 files changed, 51 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Nov 02 16:54:27 2006 +0000
+++ b/ChangeLog	Fri Nov 03 18:19:11 2006 +0000
@@ -1,3 +1,10 @@
+2006-11-03  John W. Eaton  <jwe@octave.org>
+
+	* configure.in (CRUFT_DLL_DEFS): Rename from XTRA_CRUFT_DEFS.
+	(OCTAVE_DLL_DEFS): Rename from XTRA_OCTAVE_DEFS.
+	(OCTINTERP_DLL_DEFS): Rename from XTRA_OCTINTERP_DEFS.
+	(XTRA_CRUFT_LINK_FLAGS): Rename from XTRA_CRUFT_LINK_DEPS.
+
 2006-11-02  John W. Eaton  <jwe@octave.org>
 
 	* README.Cygwin: Rename from README.Windows.
--- a/configure.in	Thu Nov 02 16:54:27 2006 +0000
+++ b/configure.in	Fri Nov 03 18:19:11 2006 +0000
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.542 $)
+AC_REVISION($Revision: 1.543 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -790,14 +790,14 @@
   AC_MSG_ERROR([See the file INSTALL for more information.])
 fi
 
-XTRA_CRUFT_LINK_DEPS=
+XTRA_CRUFT_SH_LDFLAGS=
 case "$canonical_host_type" in
   *-*-msdosmsvc)
     FLIBS="$FLIBS -lkernel32"
-    XTRA_CRUFT_LINK_DEPS="-Wl,-def:cruft.def"
+    XTRA_CRUFT_SH_LDFLAGS="-Wl,-def:cruft.def"
   ;;
 esac
-AC_SUBST(XTRA_CRUFT_LINK_DEPS)
+AC_SUBST(XTRA_CRUFT_SH_LDFLAGS)
 
 FC=$F77
 AC_SUBST(FC)
@@ -1064,9 +1064,9 @@
 NO_OCT_FILE_STRIP=false
 TEMPLATE_AR='$(AR)'
 TEMPLATE_ARFLAGS="$ARFLAGS"
-XTRA_CRUFT_DEFS=
-XTRA_OCTAVE_DEFS=
-XTRA_OCTINTERP_DEFS=
+CRUFT_DLL_DEFS=
+OCTAVE_DLL_DEFS=
+OCTINTERP_DLL_DEFS=
 library_path_var=LD_LIBRARY_PATH
 case "$canonical_host_type" in
   *-*-386bsd* | *-*-openbsd* | *-*-netbsd*)
@@ -1125,9 +1125,9 @@
     SH_LDFLAGS="-shared -g"
     library_path_var=PATH
     ## Extra compilation flags.
-    XTRA_CRUFT_DEFS="-DCRUFT_DLL"
-    XTRA_OCTAVE_DEFS="-DOCTAVE_DLL"
-    XTRA_OCTINTERP_DEFS="-DOCTINTERP_DLL"
+    CRUFT_DLL_DEFS="-DCRUFT_DLL"
+    OCTAVE_DLL_DEFS="-DOCTAVE_DLL"
+    OCTINTERP_DLL_DEFS="-DOCTINTERP_DLL"
   ;;
   *-*-linux* | *-*-gnu*)
     MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic"
@@ -1230,9 +1230,9 @@
 AC_MSG_NOTICE([defining RLD_FLAG to be $RLD_FLAG])
 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR])
 AC_MSG_NOTICE([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS])
-AC_MSG_NOTICE([defining XTRA_CRUFT_DEFS to be $XTRA_CRUFT_DEFS])
-AC_MSG_NOTICE([defining XTRA_OCTAVE_DEFS to be $XTRA_OCTAVE_DEFS])
-AC_MSG_NOTICE([defining XTRA_OCTINTERP_DEFS to be $XTRA_OCTINTERP_DEFS])
+AC_MSG_NOTICE([defining CRUFT_DLL_DEFS to be $CRUFT_DLL_DEFS])
+AC_MSG_NOTICE([defining OCTAVE_DLL_DEFS to be $OCTAVE_DLL_DEFS])
+AC_MSG_NOTICE([defining OCTINTERP_DLL_DEFS to be $OCTINTERP_DLL_DEFS])
 AC_MSG_NOTICE([defining library_path_var to be $library_path_var])
 AC_SUBST(FPICFLAG)
 AC_SUBST(CPICFLAG)
--- a/libcruft/ChangeLog	Thu Nov 02 16:54:27 2006 +0000
+++ b/libcruft/ChangeLog	Fri Nov 03 18:19:11 2006 +0000
@@ -1,3 +1,11 @@
+2006-11-03  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (DLL_CXXDEFS): Rename from XTRA_CXXDEFS.
+	(DLL_CDEFS): Rename from XTRA_CDEFS.
+	Substitute CRUFT_DLL_DEFS, not XTRA_CRUFT_DEFS.
+	(XTRA_CRUFT_SH_LDFLAGS): Rename from XTRA_CRUFT_LINK_DEPS.
+	Add $(XTRA_CRUFT_SH_LDFLAGS) to SH_LDFLAGS instead of to LINK_DEPS.
+
 2006-10-31  John W. Eaton  <jwe@octave.org>
 
 	* misc/Makefile.in (INCLUDES): Add oct-dlldefs.h to the list.
--- a/libcruft/Makefile.in	Thu Nov 02 16:54:27 2006 +0000
+++ b/libcruft/Makefile.in	Fri Nov 03 18:19:11 2006 +0000
@@ -42,9 +42,11 @@
 DISTFILES = Makefile.in ChangeLog Makerules.in $(SOURCES) \
 	STOP.patch mkf77def.in
 
+XTRA_CRUFT_SH_LDFLAGS = @XTRA_CRUFT_SH_LDFLAGS@
+SH_LDFLAGS += $(XTRA_CRUFT_SH_LDFLAGS)
+
 # Include BLAS and FFTW just in case some of libcruft depends on them
-XTRA_CRUFT_LINK_DEPS = @XTRA_CRUFT_LINK_DEPS@
-LINK_DEPS = $(BLAS_LIBS) $(FFTW_LIBS) $(FLIBS) $(XTRA_CRUFT_LINK_DEPS)
+LINK_DEPS = $(BLAS_LIBS) $(FFTW_LIBS) $(FLIBS)
 
 all: libraries
 .PHONY: all
--- a/libcruft/Makerules.in	Thu Nov 02 16:54:27 2006 +0000
+++ b/libcruft/Makerules.in	Fri Nov 03 18:19:11 2006 +0000
@@ -10,8 +10,8 @@
 # University of Wisconsin-Madison
 # Department of Chemical Engineering
 
-XTRA_CDEFS = @XTRA_CRUFT_DEFS@
-XTRA_CXXDEFS = @XTRA_CRUFT_DEFS@
+DLL_CDEFS = @CRUFT_DLL_DEFS@
+DLL_CXXDEFS = @CRUFT_DLL_DEFS@
 
 SOURCES = *.f
 
--- a/liboctave/ChangeLog	Thu Nov 02 16:54:27 2006 +0000
+++ b/liboctave/ChangeLog	Fri Nov 03 18:19:11 2006 +0000
@@ -1,3 +1,9 @@
+2006-11-03  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (DLL_CXXDEFS): Rename from XTRA_CXXDEFS.
+	(DLL_CDEFS): Rename from XTRA_CDEFS.
+	Substitute OCTAVE_DLL_DEFS, not XTRA_OCTAVE_DEFS.
+
 2006-10-28  Michael Goffioul  <michael.goffioul@swing.be>
 
 	* oct-shlib.cc: Undefine min and max after including windows.h.
--- a/liboctave/Makefile.in	Thu Nov 02 16:54:27 2006 +0000
+++ b/liboctave/Makefile.in	Fri Nov 03 18:19:11 2006 +0000
@@ -18,8 +18,8 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
-XTRA_CDEFS = @XTRA_OCTAVE_DEFS@
-XTRA_CXXDEFS = @XTRA_OCTAVE_DEFS@
+DLL_CDEFS = @OCTAVE_DLL_DEFS@
+DLL_CXXDEFS = @OCTAVE_DLL_DEFS@
 
 LINK_DEPS = \
   -L../libcruft -L. $(RLD_FLAG) \
--- a/src/ChangeLog	Thu Nov 02 16:54:27 2006 +0000
+++ b/src/ChangeLog	Fri Nov 03 18:19:11 2006 +0000
@@ -1,3 +1,9 @@
+2006-11-03  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (DLL_CXXDEFS): Rename from XTRA_CXXDEFS.
+	(DLL_CDEFS): Rename from XTRA_CDEFS.
+	Substitute OCTINTERP_DLL_DEFS, not XTRA_OCTINTERP_DEFS.
+
 2006-11-02  Michael Goffioul  <michael.goffioul@swing.be>
 
 	* sysdep.cc (MSVC_init): Also cal w32_sigint_init and
--- a/src/Makefile.in	Thu Nov 02 16:54:27 2006 +0000
+++ b/src/Makefile.in	Fri Nov 03 18:19:11 2006 +0000
@@ -14,8 +14,8 @@
 
 include $(TOPDIR)/Makeconf
 
-XTRA_CDEFS = @XTRA_OCTINTERP_DEFS@
-XTRA_CXXDEFS = @XTRA_OCTINTERP_DEFS@
+DLL_CDEFS = @OCTINTERP_DLL_DEFS@
+DLL_CXXDEFS = @OCTINTERP_DLL_DEFS@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -267,7 +267,7 @@
 	ALL_CXXFLAGS := $(filter-out -Wold-style-cast, $(ALL_CXXFLAGS))
 
 $(DLD_PICOBJ): \
-	ALL_CXXFLAGS := $(filter-out $(XTRA_CXXDEFS), $(ALL_CXXFLAGS))
+	ALL_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(ALL_CXXFLAGS))
 
 XERBLA = ../libcruft/blas-xtra/xerbla.o
 ifdef FPICFLAG