From b227198e92689310e9c72cf4ab58dbcca2b4c0ae Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 8 Nov 2017 15:36:11 +0100 Subject: [PATCH] build: fix make distcheck MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following errors in 'make distcheck': 1) GEN libnm/fake-typelib/NMClient.typelib failed to open 'libnm/fake-typelib/NMClient.typelib.tmp': No such file or directory make[2]: *** [libnm/fake-typelib/NMClient.typelib] Error 1 2) GEN libnm/fake-typelib/typelibs.c ../../libnm/fake-typelib/typelibs.gresource.xml: Failed to locate “NetworkManager.typelib” in any source directory. make[1]: *** [Makefile:17790: libnm/fake-typelib/typelibs.c] Error 1 3) ERROR: files left in build directory after distclean: ./libnm/fake-typelib/typelibs.c ./libnm/fake-typelib/NMClient.typelib ./libnm/fake-typelib/NetworkManager.typelib Fixes: 4d1f090aedf05c0e2955d431638e311d1e18a52f --- Makefile.am | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 95e7125c3d..4da2c8f6dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -960,18 +960,22 @@ INTROSPECTION_GIRS += libnm/NM-1.0.gir if WITH_FAKE_TYPELIBS -libnm/fake-typelib/NetworkManager.typelib: libnm/fake-typelib/NetworkManager.gir +libnm/fake-typelib/NetworkManager.typelib: libnm/fake-typelib/NetworkManager.gir libnm/fake-typelib/.dirstamp $(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@ -libnm/fake-typelib/NMClient.typelib: libnm/fake-typelib/NMClient.gir +libnm/fake-typelib/NMClient.typelib: libnm/fake-typelib/NMClient.gir libnm/fake-typelib/.dirstamp $(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@ libnm/fake-typelib/typelibs.c: libnm/fake-typelib/typelibs.gresource.xml libnm/fake-typelib/NetworkManager.typelib libnm/fake-typelib/NMClient.typelib - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/libnm/fake-typelib --generate-source --manual-register + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(builddir)/libnm/fake-typelib --generate-source --manual-register nodist_libnm_libnm_utils_la_SOURCES = \ libnm/fake-typelib/typelibs.c +CLEANFILES += \ + libnm/fake-typelib/typelibs.c \ + libnm/fake-typelib/NMClient.typelib \ + libnm/fake-typelib/NetworkManager.typelib endif endif