Mercurial > octave-nkf
view src/Makefile.am @ 19647:e8e3a89fa370
Fix colormap functions when N is not of class double (bug #44070)
* autumn.m, bone.m, cool.m, copper.m, cubehelix.m, gray.m, hsv.m, ocean.m,
rainbow.m, spring.m, summer.m, winter.m: cast N to double since in this
colormap functions, N is used directly used in the operations and ends up
casting colormap to something else. Note that a colormap MUST be of class
double. Also, if N is an integer class, all values in colormap end up 0
or 1. Also simplify code for input checking by declaring default on function
signature line.
* flag.m, gmap40.m, hot.m, jet.m, lines.m, pink.m, prism.m, white.m: simplify
input check like the other colormap functions.
* test/colormaps.tst: add new test file to test all colormaps at once.
* test/Makefile.am: add new test file to build system.
used to create the colormap and if less
author | Carnë Draug <carandraug@octave.org> |
---|---|
date | Fri, 23 Jan 2015 15:37:56 +0000 |
parents | 0e1f5a750d00 |
children | 4197fc428c7d |
line wrap: on
line source
# Makefile for Octave's src directory # # Copyright (C) 1993-2013 John W. Eaton # # This file is part of Octave. # # Octave is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the # Free Software Foundation; either version 3 of the License, or (at # your option) any later version. # # Octave is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. # # You should have received a copy of the GNU General Public License # along with Octave; see the file COPYING. If not, see # <http://www.gnu.org/licenses/>. include $(top_srcdir)/build-aux/common.mk ## Search local directories before those specified by the user. AM_CPPFLAGS = \ -I$(top_srcdir)/liboctave/array \ -I$(top_srcdir)/liboctave/cruft/misc \ -I$(top_srcdir)/liboctave/numeric \ -I$(top_srcdir)/liboctave/system \ -I$(top_srcdir)/liboctave/util \ -I$(top_srcdir)/libinterp \ -I$(top_builddir)/libinterp/corefcn -I$(top_srcdir)/libinterp/corefcn \ -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu AM_CFLAGS += $(WARN_CFLAGS) AM_CXXFLAGS += $(WARN_CXXFLAGS) EXTRA_DIST = \ main.in.cc \ mkoctfile.in.cc \ octave-config.in.cc DISTCLEANFILES = \ main.cc \ mkoctfile.cc \ octave-config.cc bin_PROGRAMS = \ mkoctfile \ octave \ octave-cli \ octave-config noinst_HEADERS = \ shared-fcns.h OCTAVE_VERSION_LINKS = octave-cli-$(version)$(EXEEXT) if AMCOND_BUILD_GUI archlib_PROGRAMS = octave-gui OCTAVE_VERSION_LINKS += octave-gui-$(version)$(EXEEXT) endif OCTAVE_CORE_LIBS = \ $(top_builddir)/libinterp/liboctinterp.la \ $(top_builddir)/liboctave/liboctave.la include ../libgui/link-deps.mk nodist_octave_SOURCES = main.cc octave_LDADD = \ $(top_builddir)/libgnu/libgnu.la \ $(X11_LIBS) \ $(CARBON_LIBS) \ $(GNULIB_LINK_DEPS) octave_LDFLAGS = \ $(NO_UNDEFINED_LDFLAG) \ $(OCTAVE_LINK_OPTS) if AMCOND_BUILD_GUI OCTAVE_CPPFLAGS = -DHAVE_OCTAVE_GUI endif octave_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(OCTAVE_CPPFLAGS) octave_cli_SOURCES = main-cli.cc octave_cli_LDADD = \ $(OCTAVE_CORE_LIBS) \ $(OCTAVE_LINK_DEPS) octave_cli_LDFLAGS = \ $(NO_UNDEFINED_LDFLAG) \ $(OCTAVE_LINK_OPTS) if AMCOND_BUILD_GUI octave_gui_SOURCES = main-gui.cc OCTAVE_GUI_LIBS = $(top_builddir)/libgui/liboctgui.la OCTAVE_GUI_CPPFLAGS = -I$(top_srcdir)/libgui/src endif octave_gui_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(OCTAVE_GUI_CPPFLAGS) octave_gui_LDADD = \ $(OCTAVE_GUI_LIBS) \ $(OCTAVE_CORE_LIBS) \ $(OCTAVE_GUI_LINK_DEPS) octave_gui_LDFLAGS = \ $(NO_UNDEFINED_LDFLAG) \ $(OCTAVE_GUI_LINK_OPTS) mkoctfile_SOURCES = nodist_mkoctfile_SOURCES = mkoctfile.cc mkoctfile_LDADD = $(top_builddir)/libgnu/libgnu.la $(LIBS) octave_config_SOURCES = nodist_octave_config_SOURCES = octave-config.cc octave_config_LDADD = \ $(top_builddir)/libinterp/corefcn/libcorefcn.la \ $(top_builddir)/libgnu/libgnu.la \ $(LIBS) all-local: $(OCTAVE_VERSION_LINKS) octave-config.cc: octave-config.in.cc Makefile @$(do_subst_default_vals) mkoctfile.cc: mkoctfile.in.cc Makefile @$(do_subst_config_vals) ## main.cc must depend on Makefile. Calling configure may change ## default/config values. However, calling configure will also ## regenerate the Makefiles from Makefile.am and trigger the rules below. main.cc: main.in.cc Makefile @$(do_subst_default_vals) install-exec-hook: make-version-links uninstall-local: remove-version-links make-version-links: cd $(DESTDIR)$(bindir) && \ for f in $(basename $(bin_PROGRAMS)); do \ mv $$f$(EXEEXT) $$f-$(version)$(EXEEXT) && \ $(LN_S) $$f-$(version)$(EXEEXT) $$f$(EXEEXT); \ done remove-version-links: for f in $(basename $(bin_PROGRAMS)); do \ rm -f $(DESTDIR)$(bindir)/$$f-$(version)$(EXEEXT); \ done .PHONY: make-version-links remove-version-links ## We need these file names in the build tree because the wrapper ## program (main.cc) will try to invoke the versioned binaries. octave-cli-$(version)$(EXEEXT): octave-cli$(EXEEXT) rm -f $@ $(LN_S) $< $@ octave-gui-$(version)$(EXEEXT): octave-gui$(EXEEXT) rm -f $@ $(LN_S) $< $@ CLEANFILES = \ $(OCTAVE_VERSION_LINKS)