Mercurial > octave

diff liboctave/module.mk @ 21607:37f6ed8a6f1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
store liboctave and liboctinterp hg ids separately * liboctinterp-build-info.h: Rename from build-info.h. * liboctinterp-build-info.in.cc: Rename from build-info.in.cc. * liboctinterp-build-info.h, liboctinterp-build-info.in.cc (liboctinterp_hg_id): Rename function from octave_hg_id. * libinterp/module.mk: Update. * liboctave/liboctave-build-info.h, liboctave/liboctave-build-info.in.cc: New files. * liboctave/module.mk: Update. * toplev.cc: Include both liboctave-build-info.h and liboctinterp-build-info.h. (F__octave_config_info__): Replace hg_id field with liboctave_hg_id and liboctinterp_hg_id fields.
author John W. Eaton <jwe@octave.org>
date Mon, 11 Apr 2016 12:16:19 -0400
parents f815b0145d1e
children 3d99ba3d08c1
line wrap: on
line diff
--- a/liboctave/module.mk	Mon Apr 11 11:38:46 2016 -0400
+++ b/liboctave/module.mk	Mon Apr 11 12:16:19 2016 -0400
@@ -1,4 +1,5 @@
-liboctave_EXTRA_DIST =
+liboctave_EXTRA_DIST = \
+  liboctave/liboctave-build-info.in.cc
 
 liboctave_CLEANFILES =
 liboctave_DISTCLEANFILES =
@@ -8,6 +9,7 @@
 liboctave_liboctave_la_CPPFLAGS = \
   @OCTAVE_DLL_DEFS@ \
   @CRUFT_DLL_DEFS@ \
+  -Iliboctave -I$(srcdir)/liboctave \
   -I$(srcdir)/liboctave/array \
   -I$(srcdir)/liboctave/cruft/misc \
   -Iliboctave/numeric -I$(srcdir)/liboctave/numeric \
@@ -28,9 +30,14 @@
 
 BUILT_SOURCES += \
   $(BUILT_INCS) \
-  $(BUILT_LIBOCTAVE_OPERATORS_SOURCES)
+  $(BUILT_LIBOCTAVE_OPERATORS_SOURCES) \
+  liboctave/liboctave-build-info.cc
+
+LIBOCTAVE_BUILT_NODISTFILES = \
+  liboctave/liboctave-build-info.cc
 
 octinclude_HEADERS += \
+  liboctave/liboctave-build-info.h \
   $(ARRAY_INC) \
   $(CRUFT_INC) \
   $(NUMERIC_INC) \
@@ -61,7 +68,8 @@
 
 ## liboctave merely collects a bunch of compiled convenience libraries.
 ## It has no source code itself.
-liboctave_liboctave_la_SOURCES =
+liboctave_liboctave_la_SOURCES = \
+  liboctave/liboctave-build-info.cc
 
 # Dummy C++ source to force C++ linking.
 EXTRA_liboctave_liboctave_la_SOURCES = liboctave/.dummy_force_cxx_link.cc
@@ -102,12 +110,22 @@
 
 nobase_liboctavetests_DATA = $(LIBOCTAVE_TST_FILES)
 
+liboctave/liboctave-build-info.cc: liboctave/liboctave-build-info.in.cc HG-ID | liboctave/$(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)
+
 EXTRA_DIST += $(liboctave_EXTRA_DIST)
 
 liboctave_DISTCLEANFILES += \
+  $(LIBOCTAVE_BUILT_NODISTFILES) \
   $(BUILT_INCS) \
   $(LIBOCTAVE_TST_FILES)
 
+BUILT_NODISTFILES += $(LIBOCTAVE_BUILT_NODISTFILES)
+
 CLEANFILES += $(liboctave_CLEANFILES)
 DISTCLEANFILES += $(liboctave_DISTCLEANFILES)
 MAINTAINERCLEANFILES += $(liboctave_MAINTAINERCLEANFILES)