Mercurial > octave-nkf

changeset 9816:b1462c588dd5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add -DX_DLL_DEFS to CPPFLAGS
author John W. Eaton <jwe@octave.org>
date Fri, 13 Nov 2009 22:43:41 -0500
parents 29f4f8c9b3f1
children 932b0efeb81b
files libcruft/ChangeLog libcruft/Makefile.am liboctave/ChangeLog liboctave/Makefile.am src/ChangeLog src/Makefile.am
diffstat 6 files changed, 25 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libcruft/ChangeLog	Fri Nov 13 14:59:36 2009 -0500
+++ b/libcruft/ChangeLog	Fri Nov 13 22:43:41 2009 -0500
@@ -1,3 +1,7 @@
+2009-11-13  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.am (libcruft_la_CPPFLAGS): Define.
+
 2009-11-10  John W. Eaton  <jwe@octave.org>
 
 	* blas, lapack: Remove directories and all files.
--- a/libcruft/Makefile.am	Fri Nov 13 14:59:36 2009 -0500
+++ b/libcruft/Makefile.am	Fri Nov 13 22:43:41 2009 -0500
@@ -29,6 +29,8 @@
 
 libcruft_la_SOURCES =
 
+libcruft_la_CPPFLAGS = @CRUFT_DLL_DEFS@
+
 libcruft_la_LDFLAGS = -release $(version) $(NO_UNDEFINED_LDFLAG)
 
 libcruft_la_LIBADD = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
--- a/liboctave/ChangeLog	Fri Nov 13 14:59:36 2009 -0500
+++ b/liboctave/ChangeLog	Fri Nov 13 22:43:41 2009 -0500
@@ -1,3 +1,8 @@
+2009-11-13  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.am (liboctave_la_CPPFLAGS): Add @OCTAVE_DLL_DEFS@ to
+	the list of flags.
+
 2009-11-13  Jaroslav Hajek  <highegg@gmail.com>
 
 	* mx-inlines.cc (mx_inline_any_nan): Rewrite.
--- a/liboctave/Makefile.am	Fri Nov 13 14:59:36 2009 -0500
+++ b/liboctave/Makefile.am	Fri Nov 13 22:43:41 2009 -0500
@@ -512,18 +512,20 @@
 
 liboctave_la_LIBADD = $(LINK_DEPS)
 
+liboctave_la_CPPFLAGS = \
+  @OCTAVE_DLL_DEFS@ \
+  $(SPARSE_XCPPFLAGS) \
+  $(FFTW_XCPPFLAGS) \
+  $(ARPACK_CPPFLAGS) \
+  $(AM_CPPFLAGS)
+
+
 liboctave_la_LDFLAGS = -release $(version) $(NO_UNDEFINED_LDFLAG) \
   $(SPARSE_XLDFLAGS) \
   $(ARPACK_LDFLAGS) \
   $(QRUPDATE_LDFLAGS) \
   $(FFTW_XLDFLAGS)
 
-liboctave_la_CPPFLAGS = \
-  $(SPARSE_XCPPFLAGS) \
-  $(FFTW_XCPPFLAGS) \
-  $(ARPACK_CPPFLAGS) \
-  $(AM_CPPFLAGS)
-
 octinclude_HEADERS = \
   $(INCS) \
   $(BUILT_INCS) \
--- a/src/ChangeLog	Fri Nov 13 14:59:36 2009 -0500
+++ b/src/ChangeLog	Fri Nov 13 22:43:41 2009 -0500
@@ -1,3 +1,7 @@
+2009-11-13  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.am (liboctinterp_la_CPPFLAGS): Define.
+
 2009-11-13  Joel Keay  <keay@ou.edu>
 
 	* graphics.h.in (image::properties::init): Also allow single,
--- a/src/Makefile.am	Fri Nov 13 14:59:36 2009 -0500
+++ b/src/Makefile.am	Fri Nov 13 22:43:41 2009 -0500
@@ -534,6 +534,8 @@
   $(OPT_HANDLERS) \
   $(OPT_INC)
 
+liboctinterp_la_CPPFLAGS = @OCTINTERP_DLL_DEFS@
+
 liboctinterp_la_LDFLAGS = -release $(version) $(NO_UNDEFINED_LDFLAG)
 
 ## Order matters here.  Leave builtins.cc last, because it depends on