Mercurial > octave-nkf
diff src/Makefile.in @ 7926:d74f996e005d
__magick_read__.cc: configuration and style fixes
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 14 Jul 2008 16:00:09 -0400 |
parents | e998e81224b5 |
children | 0487e46da18e |
line wrap: on
line diff
--- a/src/Makefile.in Sat Jul 12 10:11:30 2008 -0400 +++ b/src/Makefile.in Mon Jul 14 16:00:09 2008 -0400 @@ -77,7 +77,7 @@ spparms.cc sqrtm.cc svd.cc syl.cc symrcm.cc symbfact.cc \ time.cc tsearch.cc typecast.cc \ urlwrite.cc __contourc__.cc __delaunayn__.cc __dsearchn__.cc \ - __glpk__.cc __lin_interpn__.cc __pchip_deriv__.cc \ + __glpk__.cc __lin_interpn__.cc __magick_read__.cc __pchip_deriv__.cc \ __qp__.cc __voronoi__.cc __convn__.cc DLD_SRC := $(addprefix DLD-FUNCTIONS/, $(DLD_XSRC)) @@ -273,7 +273,7 @@ $(LIBPLPLOT) $(LIBGLOB) else OCTAVE_LIBS = $(LIBOCTINTERP) $(LIBOCTAVE) $(QHULL_LIBS) \ - $(GLPK_LIBS) $(REGEX_LIBS) $(SPECIAL_MATH_LIB) $(LIBCRUFT) \ + $(GLPK_LIBS) $(MAGICK_LIBS) $(REGEX_LIBS) $(SPECIAL_MATH_LIB) $(LIBCRUFT) \ $(LIBPLPLOT) $(LIBGLOB) endif @@ -625,6 +625,10 @@ || (rm -f $@-t; exit 1) @mv $@-t $@ +__magick_read__.d: CPPFLAGS += $(MAGICK_INCFLAGS) +__magick_read__.o pic/__magick_read__.o: CPPFLAGS += $(MAGICK_INCFLAGS) +__magick_read__.oct: DL_LDFLAGS += $(MAGICK_LIBS) + # How to make a .oct file from a .o file: ifeq ($(ENABLE_DYNAMIC_LINKING), true)