Mercurial > octave
diff liboctave/module.mk @ 25397:2cf750f5cb7d
make version info accessible in liboctave
* mk-version-h.in.sh: Move from libinterp to liboctave.
* configure.ac, libinterp/module.mk, liboctave/module.mk,
libgui/graphics/module.mk, libgui/src/module.mk: Update.
* version.in.h (OCTAVE_CANONICAL_HOST_TYPE): Define here instead of in
default-defs.in.h.
* liboctave/mk-version-h.in.sh: Move here from libinterp. Also
substitute OCTAVE_CANONICAL_HOST_TYPE.
* liboctave/version.cc: Move here from libinterp. Don't include
defaults.h. Use OCTAVE_CANONICAL_HOST_TYPE macro instead of
octave::config::canonical_host_type function.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 19 May 2018 13:54:04 -0400 |
| parents | 26070f36f1e7 |
| children | 358cfc60b8e1 |
line wrap: on
line diff
--- a/liboctave/module.mk Fri Mar 16 02:29:30 2018 -0500 +++ b/liboctave/module.mk Sat May 19 13:54:04 2018 -0400 @@ -1,5 +1,10 @@ %canon_reldir%_EXTRA_DIST = \ - %reldir%/liboctave-build-info.in.cc + %reldir%/liboctave-build-info.in.cc \ + %reldir%/mk-version-h.in.sh \ + %reldir%/version.in.h + +GEN_CONFIG_SHELL += \ + %reldir%/mk-version-h.sh %canon_reldir%_CLEANFILES = %canon_reldir%_DISTCLEANFILES = @@ -31,10 +36,12 @@ BUILT_SOURCES += \ $(BUILT_INCS) \ - $(BUILT_LIBOCTAVE_OPERATORS_SOURCES) + $(BUILT_LIBOCTAVE_OPERATORS_SOURCES) \ + %reldir%/version.h LIBOCTAVE_BUILT_NODISTFILES = \ - %reldir%/liboctave-build-info.cc + %reldir%/liboctave-build-info.cc \ + %reldir%/version.h octinclude_HEADERS += \ %reldir%/liboctave-build-info.h \ @@ -47,7 +54,12 @@ $(OTHER_INC) \ $(LIBOCTAVE_TEMPLATE_SRC) -nodist_octinclude_HEADERS += $(BUILT_INCS) +nodist_octinclude_HEADERS += \ + $(BUILT_INCS) \ + %reldir%/version.h + +DIST_SRC += \ + %reldir%/version.cc ## C++ files that are #included, not compiled OTHER_INC = @@ -68,7 +80,9 @@ include %reldir%/wrappers/module.mk nodist_%canon_reldir%_%canon_reldir%_la_SOURCES = \ - %reldir%/liboctave-build-info.cc + %reldir%/liboctave-build-info.cc \ + %reldir%/version.cc \ + %reldir%/version.h %canon_reldir%_%canon_reldir%_la_LIBADD += \ libgnu/libgnu.la \ @@ -106,6 +120,9 @@ nobase_liboctavetests_DATA = $(LIBOCTAVE_TST_FILES) +%reldir%/version.h: %reldir%/version.in.h %reldir%/mk-version-h.sh | %reldir%/$(octave_dirstamp) + $(AM_V_GEN)$(call simple-filter-rule,%reldir%/mk-version-h.sh) + %reldir%/liboctave-build-info.cc: %reldir%/liboctave-build-info.in.cc HG-ID | %reldir%/$(octave_dirstamp) $(AM_V_GEN)$(build-info-commands)