Mercurial > octave-libtiff
view Makefile.am @ 21102:dfcb9d74b253
Rename local gripe_XXX functions to err_XXX or warn_XXX.
* graphics.cc (err_set_invalid): Add OCTAVE_NORETURN attribute.
* graphisc.cc: Rename gripe_set_invalid to err_set_invalid.
* jit-typeinfo.cc (err_bad_result): Rename from gripe_bad_result.
* load-save.cc (err_file_open): Rename from gripe_file_open.
* ls-mat5.cc (warn_dim_too_large): Rename from gripe_dim_too_large.
* oct-stream.cc (err_invalid_file_id): Rename from gripe_invalid_file_id.
* txt-eng-ft.cc (warn_missing_glyph, warn_glyph_render): Rename from
gripe_missing_glyph, gripe_glyph_render.
* xpow.cc: Add FIXME about strange gripe_failed_diagonalization function.
* ov-base-int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc,
ov-class.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc,
ov-fcn-inline.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc,
ov-flt-re-mat.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc,
ov-str-mat.cc, ov-struct.cc
(warn_load, warn_save):
ov-base.cc (warn_load, warn_save, err_indexed_assignment,
err_assign_conversion_failed, err_no_conversion): Rename from gripe_XXX
version.
* ov-base.h (warn_load, warn_save): Rename from gripe_load, gripe_save.
* ov-classdef.cc (err_method_access, err_property_access): Rename from
gripe_method_access, gripe_property_access.
* ov-classdef.h (err_invalid_object): Rename from gripe_invalid_object.
* ov-oncleanup.h (gripe_internal): Delete function. Place single calling
instance directly in code.
* ov.cc (err_binary_op, err_binary_op_conv, err_unary_op, err_unary_op_conv,
err_unary_op_conversion_failed): Add OCTAVE_NORETURN attribute. Rename from
gripe_XXX.
* ov.cc (err_cat_op, err_cat_op_conv, ): Rename from gripe_XXX.
* lex.h (warn_single_quote_string, warn_language_extension,
maybe_warn_language_extension_comment, warn_language_extension_continuation,
warn_language_extension_operator): Rename from gripe_XXX.
* lex.ll (warn_single_quote_string, warn_language_extension,
maybe_warn_language_extension_comment, warn_language_extension_continuation,
warn_language_extension_operator): Rename from gripe_XXX.
* pt-check.cc (errmsg): Rename from gripe.
* pt-check.h (errmsg): Add OCTAVE_NORETURN attribute. Rename from gripe.
* PermMatrix.cc (err_invalid_permutation): Add OCTAVE_NORETURN attribute.
Rename from gripe_invalid_permutation.
* idx-vector.cc (err_invalid_range): Add OCTAVE_NORETURN attribute.
Rename from gripe_invalid_range.
liboctave/numeric/lo-specfun.cc (err_betainc_nonconformant): Add
OCTAVE_NORETURN attribute. Rename from gripe_betainc_nonconformant.
* oct-group.cc (err_invalid): New static function.
* oct-group.h (gripe_invalid): Delete private function.
* oct-passwd.cc (err_invalid): New static function.
* oct-passwd.h (gripe_invalid): Delete private function.
* data-conv.cc (err_unrecognized_float_fmt): Add OCTAVE_NORETURN attribute.
Rename from gripe_unrecognized_float_fmt.
* lo-cutils.c (warn_missing_wait_macro): Rename from gripe_missing_wait_macro.
* unwind-prot.cc (err_unhandled_exception): Rename from gripe_exception.
* unwind-prot.h (err_unhandled_exception): Rename from gripe_exception.
author | Rik <rik@octave.org> |
---|---|
date | Mon, 18 Jan 2016 21:06:26 -0800 |
parents | 110c7a54586b |
children | a83e7a384ee0 |
line wrap: on
line source
# Makefile for Octave # # Copyright (C) 1993-2015 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 build-aux/common.mk image_DATA = octdata_DATA = octetc_DATA = octlocale_DATA = ACLOCAL_AMFLAGS = -I m4 DOC_TARGETS = BUILT_DISTFILES = BUILT_NODISTFILES = EXTRA_DIST = BUILT_DISTFILES += \ AUTHORS \ BUGS \ ChangeLog \ INSTALL.OCTAVE EXTRA_DIST += \ CITATION \ COPYING \ INSTALL \ NEWS \ README \ build-aux/OctJavaQry.class \ build-aux/find-files-with-tests.sh \ build-aux/mk-opts.pl \ build-aux/move-if-change \ build-aux/stl_algo.h-fixed \ run-octave.in \ $(BUILT_DISTFILES) DIRSTAMP_FILES = octave_dirstamp = $(am__leading_dot)octave-dirstamp $(DIRSTAMP_FILES): $(AM_V_GEN)$(MKDIR_P) $(@D) && \ : > $@ CLEANFILES = DISTCLEANFILES = MAINTAINERCLEANFILES = info_TEXINFOS = BUILT_SOURCES = TEST_FILES = DOC_IMAGES_SRC = BUILT_DOC_IMAGES = BUILT_DOC_IMAGES_EPS = BUILT_DOC_IMAGES_PDF = BUILT_DOC_IMAGES_PNG = BUILT_DOC_IMAGES_TXT = DOC_IMAGES = DOC_IMAGES_EPS = DOC_IMAGES_PDF = DOC_IMAGES_PNG = DOC_IMAGES_TXT = FCN_FILE_DIRS = FCN_FILES = GEN_FCN_FILES = PKG_ADD_FILES = SCRIPTS_IMAGES = JAR_FILES = DOCSTRING_FILES = bin_PROGRAMS = archlib_PROGRAMS = noinst_HEADERS = OCTAVE_VERSION_LINKS = OCTAVE_CROSS_TOOLS = OCTAVE_INTERPRETER_TARGETS = octlib_LTLIBRARIES = noinst_LTLIBRARIES = octinclude_HEADERS = nodist_octinclude_HEADERS = DIST_SRC = ALL_LOCAL_TARGETS = include liboctave/module.mk include liboctave/link-deps.mk include libinterp/module.mk include libinterp/link-deps.mk include libgui/module.mk include libgui/link-deps.mk include src/module.mk include scripts/module.mk include doc/module.mk include doc/interpreter/images.mk include etc/module.mk include examples/module.mk include m4/module.mk include test/module.mk # Subdirectories in which to run make recursively. Other # directories are handled directly from this Makefile (see also the # included makefile fragments). SUBDIRS = libgnu dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook scripts-dist-hook if AMCOND_BUILD_DOCS docs-dist-hook: else docs-dist-hook: @echo "Documentation disabled. Cannot package distribution!" ; exit 1; endif if AMCOND_HAVE_ICON_TOOLS icons-dist-hook: else icons-dist-hook: @echo "Packaging distribution requires icotool and rsvg-convert." ; exit 1; endif BUILT_SOURCES += \ run-octave \ $(DIRSTAMP_FILES) if AMCOND_HAVE_BROKEN_STL_ALGO_H BUILT_SOURCES += bits/stl_algo.h else BUILT_SOURCES += nonexistent-file endif noinst_SCRIPTS = run-octave OCTAVE_INTERPRETER_TARGETS += run-octave CLEANFILES += \ $(BUILT_SOURCES) DISTCLEANFILES += \ .gdbinit \ $(DIRSTAMP_FILES) MAINTAINERCLEANFILES += \ ChangeLog \ $(BUILT_DISTFILES) CONFIG_FILES = @ac_config_headers@ @ac_config_files@ octinclude_HEADERS += oct-conf-post.h nodist_octinclude_HEADERS += config.h all-local: $(ALL_LOCAL_TARGETS) $(noinst_SCRIPTS) $(DIST_INFO_FILES) .gdbinit $(DOC_TARGETS) @echo "" @echo "Octave successfully built. Now choose from the following:" @echo "" @echo " ./run-octave - to run in place to test before installing" @echo " make check - to run the tests" @echo " make install - to install (PREFIX=$(prefix))" @echo "" run-octave: run-octave.in Makefile $(AM_V_GEN)$(do_subst_script_vals) && \ chmod a+rx "$@" bits/stl_algo.h: build-aux/stl_algo.h-fixed $(AM_V_GEN)$(MKDIR_P) bits && \ $(INSTALL_HEADER) $< $@ ## If we aren't trying to fix stl_algo.h, then try to ensure that ## there isn't a stray copy sitting in the build tree. nonexistent-file: $(AM_V_at)rm -f bits/stl_algo.h .PHONY: nonexistent-file .gdbinit: etc/gdbinit @$(gdbinit_install_rule) define changelog-from-hg-log rm -f $@-t && \ if [ -d $(srcdir)/.hg ]; then \ ( cd $(srcdir); \ hg log --style=build-aux/changelog.tmpl --prune=b0e60ad4ae26 --only-branch=`hg branch`; \ echo ""; \ echo "See the files in the directory etc/OLD-ChangeLogs for changes before 2011-04-19"; \ ) > $@-t && \ mv $@-t $@; \ elif [ ! -f $@ ] && [ ! -f $(srcdir)/$@ ]; then \ echo "Empty ChangeLog generated because no hg log available" > $@-t && \ mv $@-t $@; \ fi endef ChangeLog: $(AM_V_GEN)$(changelog-from-hg-log) .PHONY: ChangeLog octetc_DATA += \ CITATION \ NEWS if AMCOND_INSTALL_BUILD_LOGS octetc_DATA += config.log endif DIRS_TO_MAKE = \ $(localfcnfiledir) \ $(localapifcnfiledir) \ $(localverfcnfiledir) \ $(localoctfiledir) \ $(localapioctfiledir) \ $(localveroctfiledir) \ $(localarchlibdir) \ $(localapiarchlibdir) \ $(localverarchlibdir) installdirs-local: $(MKDIR_P) $(addprefix $(DESTDIR), $(DIRS_TO_MAKE)) install-data-local: installdirs-local clean-local: doc-clean distclean-local: maintainer-clean-local: doc-maintainer-clean