From 42035219f0cc2a1f080a6c61d3436e79704cd25b Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 15 May 2023 11:07:31 -0700 Subject: [PATCH] gui: Ensure that libwidgets-essential uses our header fixes too. This should fix compile and link errors with Glib before 2.76. Thanks to Frans Houweling for reporting and debugging the problem with me. --- src/ui/gui/automake.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 2eee1558cf..18885bb168 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -77,7 +77,7 @@ EXTRA_DIST += \ src/ui/gui/pspplogo.svg \ src/ui/gui/pspp.rc.in -src_ui_gui_psppire_CPPFLAGS= +src_ui_gui_psppire_CPPFLAGS = $(AM_CPPFLAGS) -Isrc/ui/gui/include bin_PROGRAMS += src/ui/gui/psppire noinst_PROGRAMS += src/ui/gui/spreadsheet-test @@ -371,6 +371,7 @@ src_ui_gui_libwidgets_essential_la_CFLAGS = \ $(GTKSOURCEVIEW_CFLAGS) \ $(SPREAD_SHEET_WIDGET_CFLAGS) \ $(AM_CFLAGS) +src_ui_gui_libwidgets_essential_la_CPPFLAGS = $(AM_CPPFLAGS) -Isrc/ui/gui/include # The unused-parameter warning is not by default disabled # in AM_CFLAGS because the core pspp code has this enabled. @@ -414,7 +415,6 @@ installcheck-local: DISPLAY=/invalid/port $(MAKE) $(AM_MAKEFLAGS) installcheck-binPROGRAMS # wrapper -src_ui_gui_psppire_CPPFLAGS += $(AM_CPPFLAGS) -Isrc/ui/gui/include BUILT_SOURCES += src/ui/gui/include/gtk/gtk.h src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h @$(MKDIR_P) src/ui/gui/include/gtk @@ -431,7 +431,6 @@ CLEANFILES += src/ui/gui/include/gtk/gtk.h EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h # wrapper -src_ui_gui_psppire_CPPFLAGS += $(AM_CPPFLAGS) -Isrc/ui/gui/include BUILT_SOURCES += src/ui/gui/include/glib.h src/ui/gui/include/glib.h: src/ui/gui/include/glib.in.h @$(MKDIR_P) src/ui/gui/include -- 2.30.2