Mercurial > octave

diff libinterp/corefcn/module.mk @ 23720:d3a9ffc9fdbd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move config macros from defaults.cc to a separate file * default-defs.in.h: New file. Move substituted macro definitions here from defaults.in.cc. * defaults.cc: Rename from defaults.in.cc. Include default-defs.h. * libinterp/corefcn/module.mk, libinterp/module.mk: Update.
author John W. Eaton <jwe@octave.org>
date Thu, 29 Jun 2017 16:44:47 -0400
parents 69a111259a2c
children ab9e51f41a29
line wrap: on
line diff
--- a/libinterp/corefcn/module.mk	Thu Jun 29 10:18:42 2017 -0400
+++ b/libinterp/corefcn/module.mk	Thu Jun 29 16:44:47 2017 -0400
@@ -130,6 +130,7 @@
   %reldir%/dassl.cc \
   %reldir%/data.cc \
   %reldir%/debug.cc \
+  %reldir%/defaults.cc \
   %reldir%/defun.cc \
   %reldir%/det.cc \
   %reldir%/dirfns.cc \
@@ -251,7 +252,7 @@
 
 ## Special rules for sources which must be built before rest of compilation.
 
-%reldir%/defaults.cc: %reldir%/defaults.in.cc build-aux/subst-default-vals.sh | %reldir%/$(octave_dirstamp)
+%reldir%/default-defs.h: %reldir%/default-defs.in.h build-aux/subst-default-vals.sh | %reldir%/$(octave_dirstamp)
 	$(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-default-vals.sh)
 
 %reldir%/graphics.h: %reldir%/graphics.in.h %reldir%/genprops.awk | %reldir%/$(octave_dirstamp)
@@ -293,6 +294,9 @@
 %reldir%/oct-tex-parser.yy: %reldir%/oct-tex-parser.in.yy
 	$(AM_V_GEN)$(call subst-bison-api-decls,octave_tex_)
 
+noinst_HEADERS += \
+  %reldir%/default-defs.h
+
 noinst_LTLIBRARIES += \
   %reldir%/libcorefcn.la
 
@@ -312,7 +316,7 @@
 %canon_reldir%_libcorefcn_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) $(LLVM_CXXFLAGS)
 
 libinterp_EXTRA_DIST += \
-  %reldir%/defaults.in.cc \
+  %reldir%/default-defs.in.h \
   %reldir%/genprops.awk \
   %reldir%/graphics.in.h \
   %reldir%/mk-errno-list.sh \