From 83b88449f25921c676e8fd775fb4defddffb6fbe Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 16 Dec 2024 22:18:45 +0100 Subject: [PATCH] hello-c-gnome3: Fix "make distcheck". * gettext-tools/examples/hello-c-gnome3/Makefile.am (BUILT_SOURCES): Add hello.desktop. (gschemas.compiled): Make it work in VPATH builds. (CLEANFILES): Remove resources.c. Don't mention hello.desktop twice. (MAINTAINERCLEANFILES): Add resources.c. * gettext-tools/examples/hello-c-gnome3/autoclean.sh: Remove also resources.c, hello.desktop.in. --- gettext-tools/examples/hello-c-gnome3/Makefile.am | 11 +++++------ gettext-tools/examples/hello-c-gnome3/autoclean.sh | 3 +++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gettext-tools/examples/hello-c-gnome3/Makefile.am b/gettext-tools/examples/hello-c-gnome3/Makefile.am index 39f3b0317..9473dec11 100644 --- a/gettext-tools/examples/hello-c-gnome3/Makefile.am +++ b/gettext-tools/examples/hello-c-gnome3/Makefile.am @@ -29,11 +29,9 @@ AM_CPPFLAGS = $(GTK_CFLAGS) # Link time dependencies. LDADD = $(GTK_LIBS) @LIBINTL@ -BUILT_SOURCES = gschemas.compiled resources.c - # Compile GSettings schema. gschemas.compiled: hello.gschema.xml - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) . + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=. $(srcdir) # Compile assets into a C source and link it with the application. resources.c: hello.gresource.xml hello.ui @@ -59,12 +57,13 @@ hello.desktop.in: hello.desktop.in.in hello.desktop: hello.desktop.in $(AM_V_GEN) sed -e 's|@bindir[@]|$(bindir)|g' $< > $@ -CLEANFILES = $(BUILT_SOURCES) hello.desktop $(desktop_DATA) +BUILT_SOURCES = gschemas.compiled resources.c hello.desktop +CLEANFILES = gschemas.compiled hello.desktop +DISTCLEANFILES = +MAINTAINERCLEANFILES = resources.c hello.desktop.in # Additional files to be distributed. EXTRA_DIST = autogen.sh autoclean.sh hello.ui \ hello.desktop.in.in hello.desktop.in \ hello.gschema.xml \ hello.gresource.xml - -MAINTAINERCLEANFILES = hello.desktop.in diff --git a/gettext-tools/examples/hello-c-gnome3/autoclean.sh b/gettext-tools/examples/hello-c-gnome3/autoclean.sh index 9b8332fb2..4c59cb289 100755 --- a/gettext-tools/examples/hello-c-gnome3/autoclean.sh +++ b/gettext-tools/examples/hello-c-gnome3/autoclean.sh @@ -7,6 +7,9 @@ test ! -f Makefile || make distclean rm -rf autom4te.cache +# Files generated by "make" and distributed (see MAINTAINERCLEANFILES). +rm -f resources.c hello.desktop.in + # Brought in by autopoint. rm -f ABOUT-NLS rm -f config.rpath -- 2.47.3