win32: Fix build of gdbus-daemon-generated.[ch]
authorAlexander Larsson <alexl@redhat.com>
Tue, 24 Apr 2012 12:03:38 +0000 (14:03 +0200)
committerAlexander Larsson <alexl@redhat.com>
Tue, 24 Apr 2012 12:09:54 +0000 (14:09 +0200)
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

gio/Makefile.am

index 560251f..bdbbf60 100644 (file)
@@ -101,10 +101,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 \