# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1670357776 18000
# Node ID 91680d96c860f33873d39586ef25718e054c5ca2
# Parent  ab33554f97d25c223cff5a305e0e6fca00ac6e70# Parent  670f3f17c280c1bc54ac08e2b9d439d1466a9951
maint: Merge stable to default.

diff -r ab33554f97d2 -r 91680d96c860 libgui/graphics/module.mk
--- a/libgui/graphics/module.mk	Tue Dec 06 11:10:48 2022 -0500
+++ b/libgui/graphics/module.mk	Tue Dec 06 15:16:16 2022 -0500
@@ -31,6 +31,8 @@
 libgraphics_MOC = \
   $(OCTAVE_GUI_GRAPHICS_MOC)
 
+libgraphics_MOC_H = $(libgraphics_MOC:.cc=.h)
+
 libgraphics_UI = \
   %reldir%/annotation-dialog.ui
 
@@ -149,6 +151,7 @@
   $(GRAPHICS_OCT_FILES) \
   $(GRAPHICS_PKG_ADD_FILE) \
   $(libgraphics_MOC) \
+  $(libgraphics_MOC_H) \
   $(libgraphics_UI_H)
 
 endif
diff -r ab33554f97d2 -r 91680d96c860 libgui/module.mk
--- a/libgui/module.mk	Tue Dec 06 11:10:48 2022 -0500
+++ b/libgui/module.mk	Tue Dec 06 15:16:16 2022 -0500
@@ -91,6 +91,11 @@
   mv $@-t $@
 endef
 
+define moc-h-command
+  $(SED) -e 's/OCTAVE_BEGIN_NAMESPACE *(\([^)]*\))/namespace \1 {/' \
+         -e 's/OCTAVE_END_NAMESPACE *([^)]*)/}/' $< > $@
+endef
+
 define rcc-command
   rm -f $@-t $@ && \
   ( echo "#if defined (HAVE_CONFIG_H)"; \
@@ -104,7 +109,12 @@
   mv $@-t $@
 endef
 
-moc-%.cc: %.h
+.PRECIOUS: moc-%.h
+
+moc-%.h: %.h
+	$(AM_V_GEN)$(moc-h-command)
+
+moc-%.cc: moc-%.h
 	$(AM_V_GEN)$(moc-command)
 
 ui-%.h: %.ui
diff -r ab33554f97d2 -r 91680d96c860 libgui/qterminal/module.mk
--- a/libgui/qterminal/module.mk	Tue Dec 06 11:10:48 2022 -0500
+++ b/libgui/qterminal/module.mk	Tue Dec 06 15:16:16 2022 -0500
@@ -115,6 +115,9 @@
 %canon_reldir%_libqterminal_la_MOC += \
   $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_UNIX_MOC)
 
+%canon_reldir%_libqterminal_la_MOC_H = \
+  $(%canon_reldir%_libqterminal_la_MOC:.cc=.h)
+
 $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_UNIX_MOC): | %reldir%/libqterminal/unix/$(octave_dirstamp)
 
 DIRSTAMP_FILES += \
@@ -124,4 +127,6 @@
 
 noinst_LTLIBRARIES += %reldir%/libqterminal.la
 
-libgui_CLEANFILES += $(%canon_reldir%_libqterminal_la_MOC)
+libgui_CLEANFILES += \
+  $(%canon_reldir%_libqterminal_la_MOC) \
+  $(%canon_reldir%_libqterminal_la_MOC_H)
diff -r ab33554f97d2 -r 91680d96c860 libgui/src/module.mk
--- a/libgui/src/module.mk	Tue Dec 06 11:10:48 2022 -0500
+++ b/libgui/src/module.mk	Tue Dec 06 15:16:16 2022 -0500
@@ -450,6 +450,8 @@
   $(octave_gui_MOC) \
   $(octave_gui_RC)
 
+octave_gui_MOC_H = $(octave_gui_MOC:.cc=.h)
+
 %canon_reldir%_%canon_reldir%_la_CPPFLAGS = \
   $(AM_CPPFLAGS) \
   $(FT2_CPPFLAGS) \
@@ -481,5 +483,6 @@
 
 libgui_CLEANFILES += \
   $(octave_gui_MOC) \
+  $(octave_gui_MOC_H) \
   $(octave_gui_UI_H) \
   $(octave_gui_RC)