From 29826d5489667bec2dfd34fb85b890be2956160a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 2 Sep 2014 09:48:58 -0400 Subject: [PATCH] Keep .ui.h files out of BUILT_SOURCES AND MAINTAINERCLEANFILES Otherwise, git.mk will add them to .gitignore, and we want to add them to source control for the benefit of tools like damn-lies which rely on being able to generate a .pot file from a pristine checkout., --- gtk/inspector/Makefile.am | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gtk/inspector/Makefile.am b/gtk/inspector/Makefile.am index 25580e622e..dfd54e09f3 100644 --- a/gtk/inspector/Makefile.am +++ b/gtk/inspector/Makefile.am @@ -6,14 +6,13 @@ resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --gener resources.h: inspector.gresource.xml $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/inspector.gresource.xml \ --target=$@ --sourcedir=$(srcdir) --c-name gtk_inspector --generate-header --manual-register -resources.c: inspector.gresource.xml $(resource_files) +resources.c: inspector.gresource.xml $(resource_files) $(template_headers) $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/inspector.gresource.xml \ --target=$@ --sourcedir=$(srcdir) --c-name gtk_inspector --generate-source --manual-register BUILT_SOURCES = \ resources.h \ - resources.c \ - $(template_headers) + resources.c libgtkinspector_la_SOURCES = \ action-editor.h \ @@ -124,12 +123,12 @@ EXTRA_DIST += \ MAINTAINERCLEANFILES = \ resources.c \ - resources.h \ - $(template_headers) + resources.h distclean-local: if test $(srcdir) != .; then \ rm -f $(MAINTAINERCLEANFILES); \ + rm -f $(template_headers); \ fi dist-hook: $(top_builddir)/build/win32/vs9/gtk-inspector.vcproj $(top_builddir)/build/win32/vs10/gtk-inspector.vcxproj $(top_builddir)/build/win32/vs10/gtk-inspector.vcxproj.filters