Mercurial > octave-nkf

comparison src/Makefile.am @ 12284:b3ac1d094a3f release-3-4-x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use same compiler flags for __fltk_uigetfile__ as for __init_fltk__
author John W. Eaton <jwe@octave.org>
date Sat, 29 Jan 2011 12:27:16 -0500
parents 02d4a18617e3
children e3048d7fb131
comparison
equal deleted inserted replaced
12283:0664a7ddd944 12284:b3ac1d094a3f
619 all-local: $(OCT_STAMP_FILES) DLD-FUNCTIONS/PKG_ADD .DOCSTRINGS 619 all-local: $(OCT_STAMP_FILES) DLD-FUNCTIONS/PKG_ADD .DOCSTRINGS
620 620
621 lex.lo lex.o oct-parse.lo oct-parse.o: \ 621 lex.lo lex.o oct-parse.lo oct-parse.o: \
622 AM_CXXFLAGS := $(filter-out -Wold-style-cast, $(AM_CXXFLAGS)) 622 AM_CXXFLAGS := $(filter-out -Wold-style-cast, $(AM_CXXFLAGS))
623 623
624 __fltk_uigetfile__.lo __fltk_uigetfile__.o: \
625 AM_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(AM_CXXFLAGS) $(GRAPHICS_CFLAGS))
626
624 __init_fltk__.lo __init_fltk__.o: \ 627 __init_fltk__.lo __init_fltk__.o: \
625 AM_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(AM_CXXFLAGS) $(GRAPHICS_CFLAGS)) 628 AM_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(AM_CXXFLAGS) $(GRAPHICS_CFLAGS))
626 629
627 # XERBLA = ../libcruft/blas-xtra/xerbla.o 630 # XERBLA = ../libcruft/blas-xtra/xerbla.o
628 631
815 818
816 DLD-FUNCTIONS/urlwrite.df: CPPFLAGS += $(CURL_CPPFLAGS) 819 DLD-FUNCTIONS/urlwrite.df: CPPFLAGS += $(CURL_CPPFLAGS)
817 DLD_FUNCTIONS_urlwrite_la_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CPPFLAGS) 820 DLD_FUNCTIONS_urlwrite_la_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CPPFLAGS)
818 DLD_FUNCTIONS_urlwrite_la_LIBADD += $(CURL_LDFLAGS) $(CURL_LIBS) 821 DLD_FUNCTIONS_urlwrite_la_LIBADD += $(CURL_LDFLAGS) $(CURL_LIBS)
819 822
823 DLD-FUNCTIONS/__fltk_uigetfile__.df: CPPFLAGS += $(GRAPHICS_CFLAGS) $(FT2_CPPFLAGS)
824 DLD_FUNCTIONS___fltk_uigetfile___la_CPPFLAGS = $(AM_CPPFLAGS) $(GRAPHICS_CFLAGS) $(FT2_CPPFLAGS)
825 DLD_FUNCTIONS___fltk_uigetfile___la_LIBADD += $(GRAPHICS_LDFLAGS) $(GRAPHICS_LIBS) $(FT2_LDFLAGS) $(FT2_LIBS)
826
820 DLD-FUNCTIONS/__glpk__.df: CPPFLAGS += $(GLPK_CPPFLAGS) 827 DLD-FUNCTIONS/__glpk__.df: CPPFLAGS += $(GLPK_CPPFLAGS)
821 DLD_FUNCTIONS___glpk___la_CPPFLAGS = $(AM_CPPFLAGS) $(GLPK_CPPFLAGS) 828 DLD_FUNCTIONS___glpk___la_CPPFLAGS = $(AM_CPPFLAGS) $(GLPK_CPPFLAGS)
822 DLD_FUNCTIONS___glpk___la_LIBADD += $(GLPK_LDFLAGS) $(GLPK_LIBS) 829 DLD_FUNCTIONS___glpk___la_LIBADD += $(GLPK_LDFLAGS) $(GLPK_LIBS)
823 830
824 DLD-FUNCTIONS/__init_fltk__.df: CPPFLAGS += $(GRAPHICS_CFLAGS) $(FT2_CPPFLAGS) 831 DLD-FUNCTIONS/__init_fltk__.df: CPPFLAGS += $(GRAPHICS_CFLAGS) $(FT2_CPPFLAGS)