Mercurial > octave

comparison libgui/graphics/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 4c85879e21b4
children 345a3f5890e7
comparison
equal deleted inserted replaced
31635:7d3467f8d713 31642:670f3f17c280
28 DIRSTAMP_FILES += \ 28 DIRSTAMP_FILES += \
29 %reldir%/$(octave_dirstamp) 29 %reldir%/$(octave_dirstamp)
30 30
31 libgraphics_MOC = \ 31 libgraphics_MOC = \
32 $(OCTAVE_GUI_GRAPHICS_MOC) 32 $(OCTAVE_GUI_GRAPHICS_MOC)
33
34 libgraphics_MOC_H = $(libgraphics_MOC:.cc=.h)
33 35
34 libgraphics_UI = \ 36 libgraphics_UI = \
35 %reldir%/annotation-dialog.ui 37 %reldir%/annotation-dialog.ui
36 38
37 libgraphics_UI_H = $(patsubst %reldir%/%.ui, %reldir%/ui-%.h, $(libgraphics_UI)) 39 libgraphics_UI_H = $(patsubst %reldir%/%.ui, %reldir%/ui-%.h, $(libgraphics_UI))
147 149
148 libgui_CLEANFILES += \ 150 libgui_CLEANFILES += \
149 $(GRAPHICS_OCT_FILES) \ 151 $(GRAPHICS_OCT_FILES) \
150 $(GRAPHICS_PKG_ADD_FILE) \ 152 $(GRAPHICS_PKG_ADD_FILE) \
151 $(libgraphics_MOC) \ 153 $(libgraphics_MOC) \
154 $(libgraphics_MOC_H) \
152 $(libgraphics_UI_H) 155 $(libgraphics_UI_H)
153 156
154 endif 157 endif