mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-09-21 09:46:18 +02:00
7b939efa6f
The ability to cross-compile glib got broken after the merge of the 'signal-performance' branch as the assumption was made that the generated glib-genmarshal can be executed on the host (which isn't valid when cross-compiling). Fixed this by using the just-built glib-genmarshal for normal compilations and the native (host) glib-genmarshal when doing a cross-compilation as was also done in several other areas of GLib Tested for host=x86_64-unknown-linux-gnu, target=x86_64-unknown-linux-gnu and host=x86_64-unknown-linux-gnu, target=i686-w64-mingw32 https://bugzilla.gnome.org/show_bug.cgi?id=671676
41 lines
1.0 KiB
Makefile
41 lines
1.0 KiB
Makefile
include $(top_srcdir)/Makefile.decl
|
|
|
|
INCLUDES = -g $(gobject_INCLUDES) $(GLIB_DEBUG_FLAGS)
|
|
|
|
if CROSS_COMPILING
|
|
glib_genmarshal=$(GLIB_GENMARSHAL)
|
|
else
|
|
glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
|
|
endif
|
|
|
|
noinst_PROGRAMS = $(TEST_PROGS)
|
|
LDADD = ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/glib/libglib-2.0.la
|
|
|
|
TEST_PROGS += \
|
|
boxed \
|
|
enums \
|
|
param \
|
|
signals \
|
|
threadtests \
|
|
dynamictests \
|
|
binding \
|
|
properties \
|
|
reference \
|
|
ifaceproperties \
|
|
valuearray
|
|
|
|
signals_SOURCES = signals.c marshalers.c
|
|
|
|
marshalers.h: Makefile.am marshalers.list
|
|
$(AM_V_GEN) $(glib_genmarshal) --prefix=test $(srcdir)/marshalers.list --header --valist-marshallers > marshalers.h
|
|
|
|
marshalers.c: Makefile.am marshalers.list
|
|
$(AM_V_GEN) $(glib_genmarshal) --prefix=test $(srcdir)/marshalers.list --body --valist-marshallers > marshalers.c
|
|
|
|
BUILT_SOURCES = marshalers.h marshalers.c
|
|
CLEANFILES = marshalers.h marshalers.c
|
|
|
|
ifaceproperties_SOURCES = ifaceproperties.c testcommon.h
|
|
|
|
EXTRA_DIST += marshalers.list
|