# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1296322036 18000
# Node ID b3ac1d094a3f86132d2dc637a3fc35bfa885379d
# Parent  0664a7ddd944208bcc13103995d922bb0b97b531
use same compiler flags for __fltk_uigetfile__ as for __init_fltk__

diff -r 0664a7ddd944 -r b3ac1d094a3f src/ChangeLog
--- a/src/ChangeLog	Fri Jan 28 22:27:17 2011 -0500
+++ b/src/ChangeLog	Sat Jan 29 12:27:16 2011 -0500
@@ -1,3 +1,8 @@
+2011-01-29  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.am (__fltk_uigetfile__): Use the same compiler flags
+	as for __init_fltk__.
+
 2011-01-28  John W. Eaton  <jwe@octave.org>
 
 	* DLD-FUNCTIONS/eigs.cc (Feigs): Assume we have ARPACK.
diff -r 0664a7ddd944 -r b3ac1d094a3f src/Makefile.am
--- a/src/Makefile.am	Fri Jan 28 22:27:17 2011 -0500
+++ b/src/Makefile.am	Sat Jan 29 12:27:16 2011 -0500
@@ -621,6 +621,9 @@
 lex.lo lex.o oct-parse.lo oct-parse.o: \
   AM_CXXFLAGS := $(filter-out -Wold-style-cast, $(AM_CXXFLAGS))
 
+__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))
 
@@ -817,6 +820,10 @@
 DLD_FUNCTIONS_urlwrite_la_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CPPFLAGS)
 DLD_FUNCTIONS_urlwrite_la_LIBADD += $(CURL_LDFLAGS) $(CURL_LIBS)
 
+DLD-FUNCTIONS/__fltk_uigetfile__.df: CPPFLAGS += $(GRAPHICS_CFLAGS) $(FT2_CPPFLAGS)
+DLD_FUNCTIONS___fltk_uigetfile___la_CPPFLAGS = $(AM_CPPFLAGS) $(GRAPHICS_CFLAGS) $(FT2_CPPFLAGS)
+DLD_FUNCTIONS___fltk_uigetfile___la_LIBADD += $(GRAPHICS_LDFLAGS) $(GRAPHICS_LIBS) $(FT2_LDFLAGS) $(FT2_LIBS)
+
 DLD-FUNCTIONS/__glpk__.df: CPPFLAGS += $(GLPK_CPPFLAGS)
 DLD_FUNCTIONS___glpk___la_CPPFLAGS = $(AM_CPPFLAGS) $(GLPK_CPPFLAGS)
 DLD_FUNCTIONS___glpk___la_LIBADD += $(GLPK_LDFLAGS) $(GLPK_LIBS)