Mercurial > octave

comparison Makefile.am @ 23427:48fd5980e29a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactor and normalize generated build info source files * Makefile.am (build-info-commands): New macro to generate build info source files containing hg revision. * libgui/module.mk (EXTRA_libgui_liboctgui_la_SOURCES): Delete variable referencing unnecessary dummy source file. (libgui_liboctgui_la_CPPFLAGS, libgui_liboctgui_la_CFLAGS, libgui_liboctgui_la_CXXFLAGS): New compilation variables. (libgui_CLEANFILES, libgui_EXTRA_DIST, nodist_libgui_liboctgui_la_SOURCES, noinst_HEADERS): Include libgui/liboctgui-build-info.* files moved from libgui/src. (libgui/liboctgui-build-info.cc): Redefine rule moved from libgui/src/module.mk using $(build-info-commands). * libgui/src/module.mk (libgui_CLEANFILES, libgui_EXTRA_DIST, nodist_libgui_src_libgui_src_la_SOURCES, noinst_HEADERS): Remove libgui/src/liboctgui-build-info.* files moved to libgui. (libgui/src/liboctgui-build-info.cc): Delete rule. * libinterp/module.mk (libinterp/liboctinterp-build-info.cc): Redefine using $(build-info-commands). * liboctave/module.mk (EXTRA_liboctave_liboctave_la_SOURCES): Delete variable referencing unnecessary dummy source file. (liboctave/liboctave-build-info.cc): Redefine using $(build-info-commands). * src/module.mk (OCTAVE_GUI_CPPFLAGS): Include -I$(srcdir)/libgui in the list. (src/octave-build-info.cc): Redefine using $(build-info-commands). * libgui/liboctgui-build-info.h, libgui/liboctgui-build-info.in.cc: Move from libgui/src. * libgui/.dummy_force_cxx_link.cc, liboctave/.dummy_force_cxx_link.cc: Delete.
author Mike Miller <mtmiller@octave.org>
date Sat, 22 Apr 2017 14:11:40 -0700
parents 092078913d54
children 03c000f5e746
comparison
equal deleted inserted replaced
23426:58d56f52d50a 23427:48fd5980e29a
452 define cp_update_rule 452 define cp_update_rule
453 if [ "x${srcdir}" != "x." ] && [ -f ${srcdir}/$@ ] && [ ! -f $@ ]; then \ 453 if [ "x${srcdir}" != "x." ] && [ -f ${srcdir}/$@ ] && [ ! -f $@ ]; then \
454 cp ${srcdir}/$@ $@; \ 454 cp ${srcdir}/$@ $@; \
455 touch -r ${srcdir}/$@ $@; \ 455 touch -r ${srcdir}/$@ $@; \
456 fi 456 fi
457 endef
458
459 define build-info-commands
460 rm -f $@-t && \
461 $(SED) \
462 -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by Makefile|" \
463 -e "s|%OCTAVE_HG_ID%|$(HG_ID_VAR)|" $< > $@-t && \
464 $(simple_move_if_change_rule)
457 endef 465 endef
458 466
459 define simple-filter-rule 467 define simple-filter-rule
460 rm -f $@-t $@ && \ 468 rm -f $@-t $@ && \
461 ${SHELL} $(1) < $< > $@-t && \ 469 ${SHELL} $(1) < $< > $@-t && \