comparison libinterp/corefcn/module.mk @ 19826:4f6ae6b94abe

make --enable-silent-rules configure option more useful * sparse-mx-ops: Rename from smx-ops. * genpropdoc.m: Write to stdout if filename is not supplied. * Makefile.am, build-aux/common.mk, doc/interpreter/Makefile.am, doc/interpreter/graphics_properties.mk, etc/icons/Makefile.am, libgui/Makefile.am, libinterp/Makefile.am, libinterp/corefcn/module.mk, libinterp/octave-value/module.mk, libinterp/operators/module.mk, libinterp/parse-tree/module.mk, liboctave/cruft/module.mk, liboctave/cruft/ranlib/module.mk, liboctave/cruft/slatec-fn/module.mk, liboctave/numeric/module.mk, liboctave/operators/module.mk, scripts/Makefile.am, scripts/java/module.mk, src/Makefile.am, test/Makefile.am: Preface rules with $(AM_V_GEN) or similar as needed. Improve consistency of rules. Prefer commands that write to stdout, redirecting output to $@-t, then moving to $@. * doc/interpreter/images.awk, libinterp/dldfcn/config-module.awk: Generate rules with $(AM_V_GEN).
author John W. Eaton <jwe@octave.org>
date Fri, 20 Feb 2015 17:18:19 -0500
parents a941a65c7cb8
children 09ed6f7538dd
comparison
equal deleted inserted replaced
19825:b254a2e0859c 19826:4f6ae6b94abe
23 $(top_builddir)/liboctave/numeric/DASSL-opts.h \ 23 $(top_builddir)/liboctave/numeric/DASSL-opts.h \
24 $(top_builddir)/liboctave/numeric/LSODE-opts.h \ 24 $(top_builddir)/liboctave/numeric/LSODE-opts.h \
25 $(top_builddir)/liboctave/numeric/Quad-opts.h 25 $(top_builddir)/liboctave/numeric/Quad-opts.h
26 26
27 $(OPT_HANDLERS): corefcn/%.cc : $(top_builddir)/liboctave/numeric/%.in 27 $(OPT_HANDLERS): corefcn/%.cc : $(top_builddir)/liboctave/numeric/%.in
28 $(PERL) $(top_srcdir)/build-aux/mk-opts.pl --opt-handler-fcns $< > $@-t 28 $(AM_V_GEN)rm -f $@-t $@ && \
29 $(PERL) $(top_srcdir)/build-aux/mk-opts.pl --opt-handler-fcns $< > $@-t && \
29 mv $@-t $@ 30 mv $@-t $@
30 31
31 $(OPT_HANDLERS): $(top_srcdir)/build-aux/mk-opts.pl 32 $(OPT_HANDLERS): $(top_srcdir)/build-aux/mk-opts.pl
32 33
33 $(OPT_INC) : %.h : %.in 34 $(OPT_INC) : %.h : %.in
34 $(MAKE) -C $(top_builddir)/liboctave/numeric $(@F) 35 $(AM_V_GEN)$(MAKE) -C $(top_builddir)/liboctave/numeric $(@F)
35 36
36 JIT_INC = \ 37 JIT_INC = \
37 corefcn/jit-util.h \ 38 corefcn/jit-util.h \
38 corefcn/jit-typeinfo.h \ 39 corefcn/jit-typeinfo.h \
39 corefcn/jit-ir.h \ 40 corefcn/jit-ir.h \
278 #display.df display.lo: CPPFLAGS += $(X11_FLAGS) 279 #display.df display.lo: CPPFLAGS += $(X11_FLAGS)
279 280
280 ## Special rules for FreeType .df files so that not all .df files are built 281 ## Special rules for FreeType .df files so that not all .df files are built
281 ## with FT2_CPPFLAGS, FONTCONFIG_CPPFLAGS 282 ## with FT2_CPPFLAGS, FONTCONFIG_CPPFLAGS
282 $(COREFCN_FT2_DF) : corefcn/%.df : corefcn/%.cc 283 $(COREFCN_FT2_DF) : corefcn/%.df : corefcn/%.cc
284 $(AM_V_GEN)rm -f $@-t $@ && \
283 $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 285 $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
284 $(AM_CPPFLAGS) $(FONTCONFIG_CPPFLAGS) $(FT2_CPPFLAGS) $(CPPFLAGS) \ 286 $(AM_CPPFLAGS) $(FONTCONFIG_CPPFLAGS) $(FT2_CPPFLAGS) $(CPPFLAGS) \
285 $(AM_CXXFLAGS) $(CXXFLAGS) \ 287 $(AM_CXXFLAGS) $(CXXFLAGS) \
286 -DMAKE_BUILTINS $< > $@-t 288 -DMAKE_BUILTINS $< > $@-t && \
287 $(srcdir)/mkdefs $(srcdir) $< < $@-t > $@ 289 $(srcdir)/mkdefs $(srcdir) $< < $@-t > $@ && \
288 rm $@-t 290 rm $@-t
289 291
290 ## Special rules for sources which must be built before rest of compilation. 292 ## Special rules for sources which must be built before rest of compilation.
291 293
292 ## defaults.h and graphics.h must depend on Makefile. Calling configure 294 ## defaults.h and graphics.h must depend on Makefile. Calling configure
293 ## may change default/config values. However, calling configure will also 295 ## may change default/config values. However, calling configure will also
294 ## regenerate the Makefiles from Makefile.am and trigger the rules below. 296 ## regenerate the Makefiles from Makefile.am and trigger the rules below.
295 corefcn/defaults.h: corefcn/defaults.in.h Makefile 297 corefcn/defaults.h: corefcn/defaults.in.h Makefile
296 @$(do_subst_default_vals) 298 $(AM_V_GEN)$(do_subst_default_vals)
297 299
298 corefcn/graphics.h: corefcn/graphics.in.h genprops.awk Makefile 300 corefcn/graphics.h: corefcn/graphics.in.h genprops.awk Makefile
299 $(AWK) -f $(srcdir)/genprops.awk $< > $@-t 301 $(AM_V_GEN)rm -f $@-t $@ && \
302 $(AWK) -f $(srcdir)/genprops.awk $< > $@-t && \
300 mv $@-t $@ 303 mv $@-t $@
301 304
302 corefcn/graphics-props.cc: corefcn/graphics.in.h genprops.awk Makefile 305 corefcn/graphics-props.cc: corefcn/graphics.in.h genprops.awk Makefile
303 $(AWK) -v emit_graphics_props=1 -f $(srcdir)/genprops.awk $< > $@-t 306 $(AM_V_GEN)rm -f $@-t $@ && \
307 $(AWK) -v emit_graphics_props=1 -f $(srcdir)/genprops.awk $< > $@-t && \
304 mv $@-t $@ 308 mv $@-t $@
305 309
306 corefcn/oct-errno.cc: corefcn/oct-errno.in.cc Makefile 310 corefcn/oct-errno.cc: corefcn/oct-errno.in.cc Makefile
311 $(AM_V_GEN)rm -f $@-t $@ && \
307 if test -n "$(PERL)"; then \ 312 if test -n "$(PERL)"; then \
308 $(srcdir)/mk-errno-list --perl "$(PERL)" < $< > $@-t; \ 313 $(srcdir)/mk-errno-list --perl "$(PERL)" < $< > $@-t; \
309 elif test -n "$(PYTHON)"; then \ 314 elif test -n "$(PYTHON)"; then \
310 $(srcdir)/mk-errno-list --python "$(PYTHON)" < $< > $@-t; \ 315 $(srcdir)/mk-errno-list --python "$(PYTHON)" < $< > $@-t; \
311 else \ 316 else \
312 $(SED) '/@SYSDEP_ERRNO_LIST@/D' $< > $@-t; \ 317 $(SED) '/@SYSDEP_ERRNO_LIST@/D' $< > $@-t; \
313 fi 318 fi && \
314 mv $@-t $@ 319 mv $@-t $@
315 320
316 corefcn/mxarray.h: corefcn/mxarray.in.h Makefile 321 corefcn/mxarray.h: corefcn/mxarray.in.h Makefile
322 $(AM_V_GEN)rm -f $@-t $@ && \
317 $(SED) < $< \ 323 $(SED) < $< \
318 -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically from $(<F) by Make.|" \ 324 -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically from $(<F) by Make.|" \
319 -e "s|%OCTAVE_IDX_TYPE%|${OCTAVE_IDX_TYPE}|" > $@-t 325 -e "s|%OCTAVE_IDX_TYPE%|${OCTAVE_IDX_TYPE}|" > $@-t && \
320 mv $@-t $@ 326 mv $@-t $@
321 327
322 corefcn/oct-tex-lexer.ll: corefcn/oct-tex-lexer.in.ll corefcn/oct-tex-symbols.in Makefile.am 328 corefcn/oct-tex-lexer.ll: corefcn/oct-tex-lexer.in.ll corefcn/oct-tex-symbols.in Makefile.am
323 $(AWK) 'BEGIN { print "/* DO NOT EDIT. AUTOMATICALLY GENERATED FROM oct-tex-lexer.in.ll and oct-tex-symbols.in. */"; } /^@SYMBOL_RULES@$$/ { count = 0; while (getline < "$(srcdir)/corefcn/oct-tex-symbols.in") { if ($$0 !~ /^#.*/ && NF == 3) { printf("\"\\\\%s\" { yylval->sym = %d; return SYM; }\n", $$1, count); count++; } } getline } ! /^@SYMBOL_RULES@$$/ { print }' $< > $@-t 329 $(AM_V_GEN)rm -f $@-t $@ && \
330 $(AWK) 'BEGIN { print "/* DO NOT EDIT. AUTOMATICALLY GENERATED FROM oct-tex-lexer.in.ll and oct-tex-symbols.in. */"; } /^@SYMBOL_RULES@$$/ { count = 0; while (getline < "$(srcdir)/corefcn/oct-tex-symbols.in") { if ($$0 !~ /^#.*/ && NF == 3) { printf("\"\\\\%s\" { yylval->sym = %d; return SYM; }\n", $$1, count); count++; } } getline } ! /^@SYMBOL_RULES@$$/ { print }' $< > $@-t && \
324 mv $@-t $@ 331 mv $@-t $@
325 332
326 corefcn/oct-tex-symbols.cc: corefcn/oct-tex-symbols.in Makefile.am 333 corefcn/oct-tex-symbols.cc: corefcn/oct-tex-symbols.in Makefile.am
327 $(AWK) 'BEGIN { print "// DO NOT EDIT. AUTOMATICALLY GENERATED FROM oct-tex-symbols.in."; print "static uint32_t symbol_codes[][2] = {"; count = 0; } END { print "};"; printf("static int num_symbol_codes = %d;\n", count); } !/^#/ && (NF == 3) { printf(" { %s, %s },\n", $$2, $$3); count++; }' $< > $@-t 334 $(AM_V_GEN)rm -f $@-t $@ && \
335 $(AWK) 'BEGIN { print "// DO NOT EDIT. AUTOMATICALLY GENERATED FROM oct-tex-symbols.in."; print "static uint32_t symbol_codes[][2] = {"; count = 0; } END { print "};"; printf("static int num_symbol_codes = %d;\n", count); } !/^#/ && (NF == 3) { printf(" { %s, %s },\n", $$2, $$3); count++; }' $< > $@-t && \
328 mv $@-t $@ 336 mv $@-t $@
329 337
330 corefcn/txt-eng.cc: corefcn/oct-tex-symbols.cc 338 corefcn/txt-eng.cc: corefcn/oct-tex-symbols.cc
331 corefcn/oct-tex-lexer.cc: LEX_OUTPUT_ROOT := lex.octave_tex_ 339 corefcn/oct-tex-lexer.cc: LEX_OUTPUT_ROOT := lex.octave_tex_
332 corefcn/oct-tex-parser.h: corefcn/oct-tex-parser.yy 340 corefcn/oct-tex-parser.h: corefcn/oct-tex-parser.yy
333 341
334 corefcn/oct-tex-parser.yy: corefcn/oct-tex-parser.in.yy 342 corefcn/oct-tex-parser.yy: corefcn/oct-tex-parser.in.yy
335 $(call subst-bison-api-decls,octave_tex_) 343 $(AM_V_GEN)$(call subst-bison-api-decls,octave_tex_)
336 344
337 noinst_LTLIBRARIES += \ 345 noinst_LTLIBRARIES += \
338 corefcn/libcorefcn.la \ 346 corefcn/libcorefcn.la \
339 corefcn/libtex_parser.la 347 corefcn/libtex_parser.la
340 348