From 9b588b3e46f08ae4f79f75cc9a8b749c2fba8f9d Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 24 Apr 2012 14:03:38 +0200 Subject: [PATCH] win32: Fix build of gdbus-daemon-generated.[ch] gdbus-daemon-generated.[ch] failed to build because it depended on gdbus-2.0/codegen/gdbus-codegen which was build during the SUBDIRS part of the build, however SUBDIRS are done *after* processing BUILT_SOURCES, and these files are in BUILT_SOURCES. The fix is simple, instead of running the gdbus-codegen code we run the gdbus-codegen.in code, which works fine for uninstalled execution. I also removed Makefile from the dependencies to avoid rebuilding the file in tarballs, as Makefiles are written at configure time. We should be able to ship the prebuilt files in the tarballs. When running uninstalled (cherry picked from commit 88bfc9b289e2b40bd7bff94dcdb06eb0b7b53f67) --- gio/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gio/Makefile.am b/gio/Makefile.am index 14810b6ac..192dd15ea 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -98,10 +98,10 @@ gdbus_sources = \ # These are not built into the library yet EXTRA_DIST += gdbusdaemon.c gdbusdaemon.h -gdbus-daemon-generated.h gdbus-daemon-generated.c : dbus-daemon.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen +gdbus-daemon-generated.h gdbus-daemon-generated.c : dbus-daemon.xml $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ - $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ + $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen.in \ --interface-prefix org. \ --generate-c-code gdbus-daemon-generated \ --c-namespace _G \