From 04bed1d3ab0a6750c9eb4abe8eb7bc8936619318 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 6 Dec 2022 21:29:38 +0000 Subject: [PATCH] build: Don't dist generated example files with Autotools The generated resources.c file should not be part of the dist tarball. --- examples/application10/Makefile.am | 6 +++--- examples/application2/Makefile.am | 6 +++--- examples/application3/Makefile.am | 6 +++--- examples/application4/Makefile.am | 6 +++--- examples/application5/Makefile.am | 6 +++--- examples/application6/Makefile.am | 6 +++--- examples/application7/Makefile.am | 6 +++--- examples/application8/Makefile.am | 6 +++--- examples/application9/Makefile.am | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/application10/Makefile.am b/examples/application10/Makefile.am index c5bda45eba..63f4746f64 100644 --- a/examples/application10/Makefile.am +++ b/examples/application10/Makefile.am @@ -16,8 +16,8 @@ exampleapp_SOURCES = \ main.c \ exampleapp.c exampleapp.h \ exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ - resources.c + exampleappprefs.c exampleappprefs.h +nodist_exampleapp_SOURCES = resources.c BUILT_SOURCES = \ resources.c \ @@ -41,7 +41,7 @@ EXTRA_DIST = \ prefs.ui \ gears-menu.ui \ exampleapp.gresource.xml \ - org.gtk.exampleapp.gschema.xml \ + org.gtk.exampleapp.gschema.xml \ meson.build CLEANFILES = \ diff --git a/examples/application2/Makefile.am b/examples/application2/Makefile.am index 8fc04789d8..ae0aafc46a 100644 --- a/examples/application2/Makefile.am +++ b/examples/application2/Makefile.am @@ -15,8 +15,8 @@ exampleapp_LDADD = $(GTK_LIBS) exampleapp_SOURCES = \ main.c \ exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - resources.c + exampleappwin.c exampleappwin.h +nodist_exampleapp_SOURCES = resources.c BUILT_SOURCES = resources.c @@ -26,7 +26,7 @@ resources.c: exampleapp.gresource.xml window.ui EXTRA_DIST = \ window.ui \ - exampleapp.gresource.xml \ + exampleapp.gresource.xml \ meson.build -include $(top_srcdir)/git.mk diff --git a/examples/application3/Makefile.am b/examples/application3/Makefile.am index 8fc04789d8..ae0aafc46a 100644 --- a/examples/application3/Makefile.am +++ b/examples/application3/Makefile.am @@ -15,8 +15,8 @@ exampleapp_LDADD = $(GTK_LIBS) exampleapp_SOURCES = \ main.c \ exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - resources.c + exampleappwin.c exampleappwin.h +nodist_exampleapp_SOURCES = resources.c BUILT_SOURCES = resources.c @@ -26,7 +26,7 @@ resources.c: exampleapp.gresource.xml window.ui EXTRA_DIST = \ window.ui \ - exampleapp.gresource.xml \ + exampleapp.gresource.xml \ meson.build -include $(top_srcdir)/git.mk diff --git a/examples/application4/Makefile.am b/examples/application4/Makefile.am index 7bc91ba1df..319fde3a63 100644 --- a/examples/application4/Makefile.am +++ b/examples/application4/Makefile.am @@ -15,8 +15,8 @@ exampleapp_LDADD = $(GTK_LIBS) exampleapp_SOURCES = \ main.c \ exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - resources.c + exampleappwin.c exampleappwin.h +nodist_exampleapp_SOURCES = resources.c BUILT_SOURCES = resources.c @@ -27,7 +27,7 @@ resources.c: exampleapp.gresource.xml window.ui app-menu.ui EXTRA_DIST = \ window.ui \ app-menu.ui \ - exampleapp.gresource.xml \ + exampleapp.gresource.xml \ meson.build -include $(top_srcdir)/git.mk diff --git a/examples/application5/Makefile.am b/examples/application5/Makefile.am index b6f34e7043..4ae065c691 100644 --- a/examples/application5/Makefile.am +++ b/examples/application5/Makefile.am @@ -15,8 +15,8 @@ exampleapp_LDADD = $(GTK_LIBS) exampleapp_SOURCES = \ main.c \ exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - resources.c + exampleappwin.c exampleappwin.h +nodist_exampleapp_SOURCES = resources.c BUILT_SOURCES = \ resources.c \ @@ -38,7 +38,7 @@ EXTRA_DIST = \ window.ui \ app-menu.ui \ exampleapp.gresource.xml \ - org.gtk.exampleapp.gschema.xml \ + org.gtk.exampleapp.gschema.xml \ meson.build CLEANFILES = \ diff --git a/examples/application6/Makefile.am b/examples/application6/Makefile.am index 9cf885ed10..fb2f69d53e 100644 --- a/examples/application6/Makefile.am +++ b/examples/application6/Makefile.am @@ -16,8 +16,8 @@ exampleapp_SOURCES = \ main.c \ exampleapp.c exampleapp.h \ exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ - resources.c + exampleappprefs.c exampleappprefs.h +nodist_exampleapp_SOURCES = resources.c BUILT_SOURCES = \ resources.c \ @@ -40,7 +40,7 @@ EXTRA_DIST = \ app-menu.ui \ prefs.ui \ exampleapp.gresource.xml \ - org.gtk.exampleapp.gschema.xml \ + org.gtk.exampleapp.gschema.xml \ meson.build CLEANFILES = \ diff --git a/examples/application7/Makefile.am b/examples/application7/Makefile.am index 9cf885ed10..fb2f69d53e 100644 --- a/examples/application7/Makefile.am +++ b/examples/application7/Makefile.am @@ -16,8 +16,8 @@ exampleapp_SOURCES = \ main.c \ exampleapp.c exampleapp.h \ exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ - resources.c + exampleappprefs.c exampleappprefs.h +nodist_exampleapp_SOURCES = resources.c BUILT_SOURCES = \ resources.c \ @@ -40,7 +40,7 @@ EXTRA_DIST = \ app-menu.ui \ prefs.ui \ exampleapp.gresource.xml \ - org.gtk.exampleapp.gschema.xml \ + org.gtk.exampleapp.gschema.xml \ meson.build CLEANFILES = \ diff --git a/examples/application8/Makefile.am b/examples/application8/Makefile.am index c5bda45eba..63f4746f64 100644 --- a/examples/application8/Makefile.am +++ b/examples/application8/Makefile.am @@ -16,8 +16,8 @@ exampleapp_SOURCES = \ main.c \ exampleapp.c exampleapp.h \ exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ - resources.c + exampleappprefs.c exampleappprefs.h +nodist_exampleapp_SOURCES = resources.c BUILT_SOURCES = \ resources.c \ @@ -41,7 +41,7 @@ EXTRA_DIST = \ prefs.ui \ gears-menu.ui \ exampleapp.gresource.xml \ - org.gtk.exampleapp.gschema.xml \ + org.gtk.exampleapp.gschema.xml \ meson.build CLEANFILES = \ diff --git a/examples/application9/Makefile.am b/examples/application9/Makefile.am index c5bda45eba..63f4746f64 100644 --- a/examples/application9/Makefile.am +++ b/examples/application9/Makefile.am @@ -16,8 +16,8 @@ exampleapp_SOURCES = \ main.c \ exampleapp.c exampleapp.h \ exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ - resources.c + exampleappprefs.c exampleappprefs.h +nodist_exampleapp_SOURCES = resources.c BUILT_SOURCES = \ resources.c \ @@ -41,7 +41,7 @@ EXTRA_DIST = \ prefs.ui \ gears-menu.ui \ exampleapp.gresource.xml \ - org.gtk.exampleapp.gschema.xml \ + org.gtk.exampleapp.gschema.xml \ meson.build CLEANFILES = \