From 409202c1fd6552d4f655ffed3bcc649f30a7dcdb Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 8 Apr 2014 09:12:24 +0100 Subject: [PATCH] build: Ensure glibconfig.h.win32 is in DISTCLEANFILES MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Otherwise it’s possible for it to not be regenerated when glibconfig.h is, leading to inconsistencies. https://bugzilla.gnome.org/show_bug.cgi?id=727829 --- glib/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glib/Makefile.am b/glib/Makefile.am index 9c728f8..c46a24d 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -9,13 +9,15 @@ include $(top_srcdir)/glib.mk # to config.status will not result in changes to glibconfig.h so we # avoid touching its timestamp (in order not to rebuild the whole tree). # -DISTCLEANFILES += glibconfig-stamp glibconfig.h +DISTCLEANFILES += glibconfig-stamp glibconfig.h glibconfig.h.win32 BUILT_SOURCES += glibconfig-stamp configexecincludedir = $(libdir)/glib-2.0/include nodist_configexecinclude_HEADERS = glibconfig.h glibconfig-stamp: ../config.status $(AM_V_GEN) cd $(top_builddir) && \ $(SHELL) ./config.status glib/glibconfig.h + $(AM_V_GEN) cd $(top_builddir) && \ + $(SHELL) ./config.status glib/glibconfig.h.win32 @touch glibconfig-stamp -- 2.7.4