Mercurial > hg > octave-terminal
changeset 15415:15c435992d3c
build: Deprecate DLL_CDEFS, CLL_CXXDEFS in Makefiles.
* libinterp/Makefile.am: Add FIXME note to remove variables in version 3.12.
* libinterp/interpfcn/module.mk: Remove Makefile rules with DLL_CXDEFS which
never fire.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 18 Sep 2012 15:41:58 -0700 |
parents | 494f9bac8862 |
children | a0fb36acbd0d |
files | libinterp/Makefile.am libinterp/interpfcn/module.mk |
diffstat | 2 files changed, 2 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/Makefile.am +++ b/libinterp/Makefile.am @@ -210,6 +210,8 @@ $(DEF_FILES): $(OPT_HANDLERS) $(OPT_INC) +## FIXME: The following two variables are deprecated and should be removed +## in Octave version 3.12. DLL_CDEFS = @OCTINTERP_DLL_DEFS@ DLL_CXXDEFS = @OCTINTERP_DLL_DEFS@
--- a/libinterp/interpfcn/module.mk +++ b/libinterp/interpfcn/module.mk @@ -65,13 +65,6 @@ $(AWK) -v emit_graphics_props=1 -f $(srcdir)/genprops.awk $< > $@-t mv $@-t $@ -## FIXME: Do these rules work correctly after transplant to interpfcn/ dir? -__fltk_uigetfile__.lo __fltk_uigetfile__.o: \ - AM_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(AM_CXXFLAGS) $(GRAPHICS_CFLAGS)) - -__init_fltk__.lo __init_fltk__.o: \ - AM_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(AM_CXXFLAGS) $(GRAPHICS_CFLAGS)) - noinst_LTLIBRARIES += interpfcn/libinterpfcn.la interpfcn_libinterpfcn_la_SOURCES = $(INTERPFCN_SRC)