# HG changeset patch
# User Rik <rik@octave.org>
# Date 1348008118 25200
# Node ID 15c435992d3cff2a9cc2511bc3813a9cf6cc70d1
# Parent  494f9bac88626af22026c9d57fc4f60e328eb122
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.

diff -r 494f9bac8862 -r 15c435992d3c libinterp/Makefile.am
--- a/libinterp/Makefile.am	Tue Sep 18 15:32:50 2012 -0700
+++ b/libinterp/Makefile.am	Tue Sep 18 15:41:58 2012 -0700
@@ -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@
 
diff -r 494f9bac8862 -r 15c435992d3c libinterp/interpfcn/module.mk
--- a/libinterp/interpfcn/module.mk	Tue Sep 18 15:32:50 2012 -0700
+++ b/libinterp/interpfcn/module.mk	Tue Sep 18 15:41:58 2012 -0700
@@ -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)