Mercurial > octave

comparison libgui/src/module.mk @ 31642:670f3f17c280 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use sed to preprocess OCTAVE_(BEGIN|END)_NAMESPACE macros for Qt moc * libgui/module.mk (moc-h-command): New macro. (moc-%.h : %.h): New rule. (moc-%.cc): Depend on moc-%.h instead of %.h. * libgui/graphics/module.mk (libgraphics_MOC_H): New variable. Add it to the $(libgui_CLEANFILES) list. * libgui/qterminal/module.mk (%canon_reldir%_libqterminal_la_MOC_H): New variable. Add it to the $(libgui_CLEANFILES) list. * libgui/src/module.mk (octave_gui_MOC_H): New variable. Add it to the $(libgui_CLEANFILES) list.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Dec 2022 14:19:16 -0500
parents a103cfd738c5
children 1a1f47f17ed4
comparison
equal deleted inserted replaced
31635:7d3467f8d713 31642:670f3f17c280
448 448
449 nodist_%canon_reldir%_%canon_reldir%_la_SOURCES = \ 449 nodist_%canon_reldir%_%canon_reldir%_la_SOURCES = \
450 $(octave_gui_MOC) \ 450 $(octave_gui_MOC) \
451 $(octave_gui_RC) 451 $(octave_gui_RC)
452 452
453 octave_gui_MOC_H = $(octave_gui_MOC:.cc=.h)
454
453 %canon_reldir%_%canon_reldir%_la_CPPFLAGS = \ 455 %canon_reldir%_%canon_reldir%_la_CPPFLAGS = \
454 $(AM_CPPFLAGS) \ 456 $(AM_CPPFLAGS) \
455 $(FT2_CPPFLAGS) \ 457 $(FT2_CPPFLAGS) \
456 $(FONTCONFIG_CPPFLAGS) \ 458 $(FONTCONFIG_CPPFLAGS) \
457 @OCTGUI_DLL_DEFS@ \ 459 @OCTGUI_DLL_DEFS@ \
479 $(octave_gui_UI) \ 481 $(octave_gui_UI) \
480 $(octave_gui_ICONS) 482 $(octave_gui_ICONS)
481 483
482 libgui_CLEANFILES += \ 484 libgui_CLEANFILES += \
483 $(octave_gui_MOC) \ 485 $(octave_gui_MOC) \
486 $(octave_gui_MOC_H) \
484 $(octave_gui_UI_H) \ 487 $(octave_gui_UI_H) \
485 $(octave_gui_RC) 488 $(octave_gui_RC)