luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-27 12:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

win32: Fix build of gdbus-daemon-generated.[ch]

Browse Source 
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
This commit is contained in:
Alexander Larsson 2012-04-24 14:03:38 +02:00
parent 2c0756ea0e
commit 88bfc9b289
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/Makefile.am
View File

@ -101,10 +101,10 @@ gdbus_sources = \
# These are not built into the library yet # These are not built into the library yet
EXTRA_DIST += gdbusdaemon.c gdbusdaemon.h 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) \ $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ 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. \ --interface-prefix org. \
--generate-c-code gdbus-daemon-generated \ --generate-c-code gdbus-daemon-generated \
--c-namespace _G \ --c-namespace _G \