Last active
August 29, 2015 14:13
-
-
Save jlhg/fa2bdfa70fe991234207 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/gio/Makefile.in b/gio/Makefile.in | |
| index f9a4f24..5d9a429 100644 | |
| --- a/gio/Makefile.in | |
| +++ b/gio/Makefile.in | |
| @@ -1289,7 +1289,7 @@ CLEANFILES = gdbus-daemon-generated.c gdbus-daemon-generated.h gio-public-header | |
| glib_compile_resources_LDADD = \ | |
| $(top_builddir)/glib/libglib-2.0.la \ | |
| $(top_builddir)/gobject/libgobject-2.0.la \ | |
| - libgio-2.0.la | |
| + libgio-2.0.la $(LIBFFI_LIBS) | |
| glib_compile_resources_SOURCES = \ | |
| gvdb/gvdb-format.h \ | |
| @@ -1302,7 +1302,7 @@ gio_querymodules_LDADD = \ | |
| $(top_builddir)/glib/libglib-2.0.la \ | |
| $(top_builddir)/gobject/libgobject-2.0.la \ | |
| $(top_builddir)/gmodule/libgmodule-2.0.la \ | |
| - libgio-2.0.la \ | |
| + libgio-2.0.la $(LIBFFI_LIBS) \ | |
| $(NULL) | |
| glib_compile_schemas_LDADD = $(top_builddir)/glib/libglib-2.0.la | |
| @@ -1316,7 +1316,7 @@ glib_compile_schemas_SOURCES = \ | |
| gsettings_LDADD = \ | |
| $(top_builddir)/glib/libglib-2.0.la \ | |
| $(top_builddir)/gobject/libgobject-2.0.la \ | |
| - libgio-2.0.la | |
| + libgio-2.0.la $(LIBFFI_LIBS) | |
| gsettings_SOURCES = gsettings-tool.c | |
| schemadir = $(datadir)/glib-2.0/schemas | |
| @@ -1324,7 +1324,7 @@ dist_schema_DATA = gschema.dtd | |
| gdbus_SOURCES = gdbus-tool.c | |
| gdbus_LDADD = libgio-2.0.la \ | |
| $(top_builddir)/glib/libglib-2.0.la \ | |
| - $(top_builddir)/gobject/libgobject-2.0.la | |
| + $(top_builddir)/gobject/libgobject-2.0.la $(LIBFFI_LIBS) | |
| completiondir = $(datadir)/bash-completion/completions | |
| completion_DATA = \ | |
| diff --git a/gio/tests/Makefile.in b/gio/tests/Makefile.in | |
| index 7d8d1dc..83e7a28 100644 | |
| --- a/gio/tests/Makefile.in | |
| +++ b/gio/tests/Makefile.in | |
| @@ -1070,7 +1070,7 @@ progs_ldadd = \ | |
| $(top_builddir)/gthread/libgthread-2.0.la \ | |
| $(top_builddir)/gobject/libgobject-2.0.la \ | |
| $(top_builddir)/gmodule/libgmodule-2.0.la \ | |
| - $(top_builddir)/gio/libgio-2.0.la | |
| + $(top_builddir)/gio/libgio-2.0.la $(LIBFFI_LIBS) | |
| SAMPLE_PROGS = resolver socket-server socket-client echo-server httpd \ | |
| send-data filter-cat gdbus-example-export \ | |
| diff --git a/gobject/Makefile.in b/gobject/Makefile.in | |
| index 07b34a6..e64de41 100644 | |
| --- a/gobject/Makefile.in | |
| +++ b/gobject/Makefile.in | |
| @@ -626,7 +626,7 @@ gobject_query_SOURCES = gobject-query.c | |
| glib_genmarshal_SOURCES = glib-genmarshal.c | |
| testgobject_SOURCES = testgobject.c | |
| # link programs against libgobject | |
| -progs_LDADD = ./libgobject-2.0.la $(libglib) | |
| +progs_LDADD = ./libgobject-2.0.la $(libglib) $(LIBFFI_LIBS) | |
| glib_genmarshal_LDADD = $(libglib) | |
| gobject_query_LDADD = $(progs_LDADD) | |
| testgobject_LDADD = $(progs_LDADD) | |
| diff --git a/gobject/tests/Makefile.in b/gobject/tests/Makefile.in | |
| index 3e1f52b..de5d375 100644 | |
| --- a/gobject/tests/Makefile.in | |
| +++ b/gobject/tests/Makefile.in | |
| @@ -458,7 +458,7 @@ AM_CPPFLAGS = \ | |
| INCLUDES = -g $(gobject_INCLUDES) $(GLIB_DEBUG_FLAGS) | |
| @CROSS_COMPILING_FALSE@glib_genmarshal = $(top_builddir)/gobject/glib-genmarshal | |
| @CROSS_COMPILING_TRUE@glib_genmarshal = $(GLIB_GENMARSHAL) | |
| -LDADD = ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/glib/libglib-2.0.la | |
| +LDADD = ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/glib/libglib-2.0.la $(LIBFFI_LIBS) | |
| signals_SOURCES = signals.c marshalers.c | |
| BUILT_SOURCES = marshalers.h marshalers.c | |
| CLEANFILES = marshalers.h marshalers.c |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment