Mercurial > octave
view libinterp/module.mk @ 21966:112b20240c87
move docstrings in C++ files out of C strings and into comments
* __contourc__.cc, __dispatch__.cc, __dsearchn__.cc, __ichol__.cc,
__ilu__.cc, __lin_interpn__.cc, __luinc__.cc, __magick_read__.cc,
__pchip_deriv__.cc, __qp__.cc, balance.cc, besselj.cc, betainc.cc,
bitfcns.cc, bsxfun.cc, cellfun.cc, colloc.cc, conv2.cc, daspk.cc,
dasrt.cc, dassl.cc, data.cc, debug.cc, defaults.cc, det.cc, dirfns.cc,
dlmread.cc, dot.cc, eig.cc, ellipj.cc, error.cc, fft.cc, fft2.cc,
fftn.cc, file-io.cc, filter.cc, find.cc, gammainc.cc, gcd.cc,
getgrent.cc, getpwent.cc, getrusage.cc, givens.cc, graphics.cc,
hash.cc, help.cc, hess.cc, hex2num.cc, input.cc, inv.cc, kron.cc,
load-path.cc, load-save.cc, lookup.cc, ls-oct-text.cc, lsode.cc,
lu.cc, mappers.cc, matrix_type.cc, max.cc, mgorth.cc, nproc.cc,
oct-hist.cc, octave-link.cc, ordschur.cc, pager.cc, pinv.cc,
pr-output.cc, profiler.cc, psi.cc, pt-jit.cc, quad.cc, quadcc.cc,
qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, sighandlers.cc,
sparse.cc, spparms.cc, sqrtm.cc, str2double.cc, strfind.cc, strfns.cc,
sub2ind.cc, svd.cc, sylvester.cc, symtab.cc, syscalls.cc, sysdep.cc,
time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, urlwrite.cc,
utils.cc, variables.cc, __delaunayn__.cc, __eigs__.cc,
__fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc,
__init_gnuplot__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc,
audiodevinfo.cc, audioread.cc, ccolamd.cc, chol.cc, colamd.cc,
convhulln.cc, dmperm.cc, fftw.cc, qr.cc, symbfact.cc, symrcm.cc,
ov-base.cc, ov-bool-mat.cc, ov-cell.cc, ov-class.cc, ov-classdef.cc,
ov-fcn-handle.cc, ov-fcn-inline.cc, ov-flt-re-mat.cc, ov-int16.cc,
ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-java.cc, ov-null-mat.cc,
ov-oncleanup.cc, ov-range.cc, ov-re-mat.cc, ov-struct.cc,
ov-typeinfo.cc, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc,
ov-usr-fcn.cc, ov.cc, octave.cc, pt-arg-list.cc, pt-binop.cc,
pt-eval.cc, pt-mat.cc, lex.ll, oct-parse.in.yy:
Docstrings are now comments instead of C strings.
* build-aux/mk-opts.pl: Emit docstrings as comments instead of C
strings.
* DASPK-opts.in, LSODE-opts.in: Don't quote " in docstring fragments.
* builtins.h: Include builtin-defun-decls.h unconditionally.
* defun.h (DEFUN, DEFUNX, DEFCONSTFUN): Simply emit declaration.
(DEFALIAS): Always expand to nothing.
* defun-dld.h: No special macro expansions for MAKE_BUILTINS.
(DEFUN_DLD): Use FORWARD_DECLARE_FUN.
(DEFUNX_DLD): Use FORWARD_DECLARE_FUNX.
* defun-int.h: No special macro expansions for MAKE_BUILTINS.
(FORWARD_DECLARE_FUN, FORWARD_DECLARE_FUNX): New macros.
(DEFINE_FUN_INSTALLER_FUN): If compiling an Octave source file, pass
"external-doc" to DEFINE_FUNX_INSTALLER_FUN.
(DEFUN_INTERNAL, DEFCONSTFUN_INTERNAL, DEFUNX_INTERNAL,
DEFALIAS_INTERNAL): Delete.
* common.mk (move_if_change_rule): New macro.
(simple_move_if_change_rule): Define using move_if_change_rule.
* find-defun-files.sh (DEFUN_PATTERN): Update. Don't transform file
name extension to ".df".
* libinterp/mk-pkg-add, gendoc.pl: Operate directly on source files.
* mkbuiltins: New argument, SRCDIR. Operate directly on source files.
* mkdefs: Delete.
* libinterp/module.mk (BUILT_SOURCES): Update list to contain only
files included in other source files.
(GENERATED_MAKE_BUILTINS_INCS, DEF_FILES): Delete.
(LIBINTERP_BUILT_DISTFILES): Include $(OPT_HANDLERS) here.
(LIBINTERP_BUILT_NODISTFILES): Not here. Remove $(ALL_DEF_FILES from
the list.
(libinterp_EXTRA_DIST): Remove mkdefs from the list.
(FOUND_DEFUN_FILES): Rename from SRC_DEF_FILES.
(DLDFCN_DEFUN_FILES): Rename from DLDFCN_DEF_FILES.
(SRC_DEFUN_FILES): Rename from SRC_DEF_FILES.
(ALL_DEFUN_FILES): Rename from ALL_DEF_FILES.
(%.df: %.cc): Delete pattern rule.
(libinterp/build-env-features.cc, libinterp/builtins.cc,
libinterp/dldfcn/PKG_ADD): Use mv instead of move-if-change.
(libinterp/builtins.cc, libinterp/builtin-defun-decls.h):
Update mkbuiltins command.
($(srcdir)/libinterp/DOCSTRINGS): Update gendoc.pl command.
* liboctave/module.mk (BUILT_SOURCES): Don't include
liboctave-build-info.cc in the list.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 21 Jun 2016 16:07:51 -0400 |
parents | aab79a1885cc |
children | 9adb35378488 |
line wrap: on
line source
libinterp_EXTRA_DIST = libinterp_CLEANFILES = libinterp_DISTCLEANFILES = libinterp_MAINTAINERCLEANFILES = ## Search local directories before those specified by the user. libinterp_liboctinterp_la_CPPFLAGS = \ @OCTINTERP_DLL_DEFS@ \ -Iliboctave -I$(srcdir)/liboctave \ -I$(srcdir)/liboctave/cruft/misc \ -I$(srcdir)/liboctave/array \ -Iliboctave/numeric -I$(srcdir)/liboctave/numeric \ -Iliboctave/operators -I$(srcdir)/liboctave/operators \ -I$(srcdir)/liboctave/system \ -I$(srcdir)/liboctave/util \ -I$(srcdir)/libinterp/octave-value \ -Ilibinterp -I$(srcdir)/libinterp \ -I$(srcdir)/libinterp/operators \ -Ilibinterp/parse-tree -I$(srcdir)/libinterp/parse-tree \ -Ilibinterp/corefcn -I$(srcdir)/libinterp/corefcn \ -I$(srcdir)/liboctave/wrappers \ $(HDF5_CPPFLAGS) \ $(MAGICK_CPPFLAGS) libinterp_liboctinterp_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) libinterp_liboctinterp_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) octlib_LTLIBRARIES += libinterp/liboctinterp.la BUILT_SOURCES += \ libinterp/builtin-defun-decls.h \ libinterp/corefcn/defaults.h \ libinterp/corefcn/graphics-props.cc \ libinterp/corefcn/graphics.h \ libinterp/corefcn/mxarray.h \ libinterp/parse-tree/oct-gperf.h \ libinterp/parse-tree/oct-parse.h \ libinterp/version.h ULT_PARSER_SRC := \ libinterp/corefcn/oct-tex-lexer.in.ll \ libinterp/corefcn/oct-tex-parser.in.yy \ libinterp/parse-tree/oct-parse.in.yy GENERATED_PARSER_FILES := \ libinterp/corefcn/oct-tex-lexer.ll \ libinterp/corefcn/oct-tex-parser.h \ libinterp/corefcn/oct-tex-parser.yy \ libinterp/parse-tree/oct-parse.yy ## These generated files are included in the source distribution to ## avoid needing certain tools to build from a distribution tarball. LIBINTERP_BUILT_DISTFILES = \ $(GENERATED_PARSER_FILES) \ $(OPT_HANDLERS) \ libinterp/corefcn/oct-tex-parser.h \ libinterp/corefcn/oct-tex-symbols.cc \ libinterp/parse-tree/oct-gperf.h \ libinterp/parse-tree/oct-parse.h ## Files that are created during build process and installed, ## BUT not distributed in tarball. LIBINTERP_BUILT_NODISTFILES = \ libinterp/build-env.cc \ libinterp/build-env-features.cc \ libinterp/liboctinterp-build-info.cc \ libinterp/corefcn/mxarray.h \ libinterp/corefcn/oct-errno.cc \ libinterp/corefcn/defaults.h \ libinterp/corefcn/graphics.h \ libinterp/builtin-defun-decls.h \ libinterp/operators/ops.cc \ libinterp/version.h \ libinterp/builtins.cc libinterp_EXTRA_DIST += \ $(srcdir)/libinterp/DOCSTRINGS \ libinterp/build-env.in.cc \ libinterp/build-env-features.sh \ libinterp/find-defun-files.sh \ libinterp/gendoc.pl \ libinterp/genprops.awk \ libinterp/liboctinterp-build-info.in.cc \ libinterp/mk-errno-list \ libinterp/mk-pkg-add \ libinterp/mkbuiltins \ libinterp/mkops \ libinterp/version.in.h \ $(LIBINTERP_BUILT_DISTFILES) octinclude_HEADERS += \ libinterp/corefcn/graphics-props.cc \ libinterp/builtins.h \ libinterp/builtin-defun-decls.h \ libinterp/build-env.h \ libinterp/liboctinterp-build-info.h \ libinterp/octave.h \ libinterp/options-usage.h \ $(OCTAVE_VALUE_INC) \ $(PARSE_TREE_INC) \ $(PARSER_INC) \ $(COREFCN_INC) noinst_HEADERS += \ $(LIBINTERP_OPERATORS_INC) nodist_octinclude_HEADERS += \ libinterp/corefcn/mxarray.h \ libinterp/corefcn/defaults.h \ libinterp/corefcn/graphics.h \ libinterp/version.h DIST_SRC += \ libinterp/octave.cc \ libinterp/version.cc \ $(OCTAVE_VALUE_SRC) \ $(PARSE_TREE_SRC) \ $(COREFCN_SRC) include libinterp/parse-tree/module.mk include libinterp/octave-value/module.mk include libinterp/operators/module.mk include libinterp/template-inst/module.mk include libinterp/corefcn/module.mk include libinterp/dldfcn/module.mk $(srcdir)/libinterp/dldfcn/module.mk: $(srcdir)/libinterp/dldfcn/config-module.sh $(srcdir)/libinterp/dldfcn/config-module.awk $(srcdir)/libinterp/dldfcn/module-files $(AM_V_GEN)$(SHELL) $(srcdir)/libinterp/dldfcn/config-module.sh $(srcdir) if AMCOND_ENABLE_DYNAMIC_LINKING OCT_FILES = $(DLDFCN_LIBS:.la=.oct) DLD_LIBOCTINTERP_LIBADD = libinterp/liboctinterp.la else OCT_FILES = DLD_LIBOCTINTERP_LIBADD = endif libinterp_liboctinterp_la_SOURCES = \ libinterp/octave.cc \ libinterp/version.cc \ $(LIBINTERP_OPERATORS_SRC) \ $(TEMPLATE_INST_SRC) nodist_libinterp_liboctinterp_la_SOURCES = \ libinterp/corefcn/mxarray.h \ libinterp/corefcn/oct-errno.cc \ libinterp/corefcn/defaults.h \ libinterp/corefcn/graphics.h \ libinterp/operators/ops.cc \ libinterp/builtin-defun-decls.h \ libinterp/builtins.cc \ libinterp/build-env.cc \ libinterp/build-env-features.cc \ libinterp/liboctinterp-build-info.cc \ libinterp/version.h libinterp_liboctinterp_la_LIBADD = \ libinterp/octave-value/liboctave-value.la \ libinterp/parse-tree/libparse-tree.la \ libinterp/corefcn/libcorefcn.la \ liboctave/liboctave.la \ $(LIBOCTINTERP_LINK_DEPS) # Increment these as needed and according to the rules in the libtool manual: libinterp_liboctinterp_current = 3 libinterp_liboctinterp_revision = 0 libinterp_liboctinterp_age = 0 libinterp_liboctinterp_version_info = $(libinterp_liboctinterp_current):$(libinterp_liboctinterp_revision):$(libinterp_liboctinterp_age) libinterp_liboctinterp_la_LDFLAGS = \ -version-info $(libinterp_liboctinterp_version_info) \ $(NO_UNDEFINED_LDFLAG) \ -bindir $(bindir) \ $(LIBOCTINTERP_LINK_OPTS) \ $(WARN_LDFLAGS) ULT_DIST_SRC := \ $(filter-out $(GENERATED_PARSER_FILES), $(DIST_SRC)) $(ULT_PARSER_SRC) FOUND_DEFUN_FILES := \ $(shell $(SHELL) $(srcdir)/libinterp/find-defun-files.sh "$(srcdir)" $(ULT_DIST_SRC)) SRC_DEFUN_FILES = $(OPT_HANDLERS) $(FOUND_DEFUN_FILES) DLDFCN_DEFUN_FILES = $(DLDFCN_SRC) if AMCOND_ENABLE_DYNAMIC_LINKING DEFUN_FILES = $(SRC_DEFUN_FILES) else DEFUN_FILES = $(SRC_DEFUN_FILES) $(DLDFCN_DEFUN_FILES) endif ALL_DEFUN_FILES = $(SRC_DEFUN_FILES) $(DLDFCN_DEFUN_FILES) ## FIXME: The following two variables are deprecated and should be removed ## in Octave version 3.12. DLL_CDEFS = @OCTINTERP_DLL_DEFS@ DLL_CXXDEFS = @OCTINTERP_DLL_DEFS@ ## Rules to build test files LIBINTERP_TST_FILES_SRC := $(shell $(SHELL) $(srcdir)/build-aux/find-files-with-tests.sh "$(srcdir)" $(ULT_DIST_SRC) $(DLDFCN_SRC)) LIBINTERP_TST_FILES := $(addsuffix -tst,$(LIBINTERP_TST_FILES_SRC)) libinterptestsdir := $(octtestsdir) nobase_libinterptests_DATA = $(LIBINTERP_TST_FILES) ## Override Automake's rule that forces a .hh extension on us even ## though we don't want it. It would be super awesome if automake ## would allow users to choose the header file extension. .yy.cc: $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE) ## Special rules: ## Mostly for sources which must be built before rest of compilation. libinterp/build-env.cc: libinterp/build-env.in.cc build-aux/subst-config-vals.sh | libinterp/$(octave-dirstamp) $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-config-vals.sh) libinterp/build-env-features.cc: config.h libinterp/build-env-features.sh | libinterp/$(octave-dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SHELL) $(srcdir)/libinterp/build-env-features.sh $< > $@-t && \ mv $@-t $@ libinterp/version.h: libinterp/version.in.h build-aux/mk-version-h.sh | libinterp/$(octave-dirstamp) $(AM_V_GEN)$(call simple-filter-rule,build-aux/mk-version-h.sh) libinterp/liboctinterp-build-info.cc: libinterp/liboctinterp-build-info.in.cc HG-ID | libinterp/$(octave-dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SED) \ -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by Makefile|" \ -e "s|%OCTAVE_HG_ID%|`cat $(builddir)/HG-ID`|" $< > $@-t && \ $(simple_move_if_change_rule) libinterp/builtins.cc: $(ALL_DEFUN_FILES) libinterp/mkbuiltins | libinterp/$(octave-dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SHELL) $(srcdir)/libinterp/mkbuiltins "$(srcdir)" --source $(ALL_DEFUN_FILES) > $@-t && \ mv $@-t $@ libinterp/builtin-defun-decls.h: $(ALL_DEFUN_FILES) libinterp/mkbuiltins | libinterp/$(octave-dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SHELL) $(srcdir)/libinterp/mkbuiltins "$(srcdir)" --header $(ALL_DEFUN_FILES) > $@-t && \ $(simple_move_if_change_rule) if AMCOND_ENABLE_DYNAMIC_LINKING DLDFCN_PKG_ADD_FILE = libinterp/dldfcn/PKG_ADD libinterp/dldfcn/PKG_ADD: $(DLDFCN_DEFUN_FILES) libinterp/mk-pkg-add | libinterp/$(octave-dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SHELL) $(srcdir)/libinterp/mk-pkg-add "$(srcdir)" $(DLDFCN_DEFUN_FILES) > $@-t && \ mv $@-t $@ endif if AMCOND_BUILD_DOCS DOCSTRING_FILES += $(srcdir)/libinterp/DOCSTRINGS $(srcdir)/libinterp/DOCSTRINGS: $(ALL_DEFUN_FILES) | libinterp/$(octave-dirstamp) $(AM_V_GEN)rm -f libinterp/DOCSTRINGS-t && \ $(PERL) $(srcdir)/libinterp/gendoc.pl "$(srcdir)" $(ALL_DEFUN_FILES) > libinterp/DOCSTRINGS-t && \ mv libinterp/DOCSTRINGS-t $@ endif OCTAVE_INTERPRETER_TARGETS += \ $(OCT_FILES) \ $(DLDFCN_PKG_ADD_FILE) if AMCOND_BUILD_DOCS install-data-hook: install-oct install-built-in-docstrings else install-data-hook: install-oct uninstall-built-in-docstrings endif uninstall-local: uninstall-oct uninstall-built-in-docstrings if AMCOND_ENABLE_DYNAMIC_LINKING install-oct: $(MKDIR_P) $(DESTDIR)$(octfiledir) if [ -n "`cat $(DLDFCN_PKG_ADD_FILE)`" ]; then \ $(INSTALL_DATA) $(DLDFCN_PKG_ADD_FILE) $(DESTDIR)$(octfiledir)/PKG_ADD; \ fi cd $(DESTDIR)$(octlibdir) && \ for ltlib in $(DLDFCN_LIBS); do \ f=`echo $$ltlib | $(SED) 's,.*/,,'`; \ dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \ if [ -n "$$dl" ]; then \ $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \ else \ echo "error: dlname is empty in $$ltlib!"; \ exit 1; \ fi; \ lnames=`$(SED) -n -e "s/library_names='\([^']*\)'/\1/p" < $$f`; \ if [ -n "$$lnames" ]; then \ rm -f $$f $$lnames $$dl; \ fi \ done uninstall-oct: for f in $(notdir $(OCT_FILES)); do \ rm -f $(DESTDIR)$(octfiledir)/$$f; \ done rm -f $(DESTDIR)$(octfiledir)/PKG_ADD endif .PHONY: install-oct uninstall-oct if AMCOND_BUILD_DOCS install-built-in-docstrings: $(MKDIR_P) $(DESTDIR)$(octetcdir) $(INSTALL_DATA) $(srcdir)/libinterp/DOCSTRINGS $(DESTDIR)$(octetcdir)/built-in-docstrings uninstall-built-in-docstrings: rm -f $(DESTDIR)$(octetcdir)/built-in-docstrings endif .PHONY: install-built-in-docstrings uninstall-built-in-docstrings EXTRA_DIST += $(libinterp_EXTRA_DIST) libinterp_CLEANFILES += \ $(DLDFCN_PKG_ADD_FILE) \ libinterp/corefcn/graphics-props.cc \ libinterp/corefcn/oct-tex-parser.output \ libinterp/parse-tree/oct-parse.output libinterp_DISTCLEANFILES += \ $(LIBINTERP_BUILT_NODISTFILES) \ $(OCT_FILES) \ $(LIBINTERP_TST_FILES) libinterp_MAINTAINERCLEANFILES += \ $(srcdir)/libinterp/DOCSTRINGS \ $(LIBINTERP_BUILT_DISTFILES) BUILT_DISTFILES += $(LIBINTERP_BUILT_DISTFILES) BUILT_NODISTFILES += $(LIBINTERP_BUILT_NODISTFILES) CLEANFILES += $(libinterp_CLEANFILES) DISTCLEANFILES += $(libinterp_DISTCLEANFILES) MAINTAINERCLEANFILES += $(libinterp_MAINTAINERCLEANFILES) libinterp-clean: rm -f $(libinterp_CLEANFILES) libinterp-distclean: libinterp-clean rm -f $(libinterp_DISTCLEANFILES) libinterp-maintainer-clean: libinterp-distclean rm -f $(libinterp_MAINTAINERCLEANFILES)