luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-11 11:56:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1201-inotify-linking' into 'master'

Browse Source 
Resolve "Linking failure on midipix with slibtool"

Closes #1201

See merge request GNOME/glib!157
This commit is contained in:
Philip Withnall 2018-07-09 11:16:29 +00:00
commit 4deb94f067
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/inotify/Makefile.am
View File

@ -26,3 +26,7 @@ libinotify_la_CFLAGS = \
-DGIO_COMPILATION \ -DGIO_COMPILATION \
-DG_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED
libinotify_la_LIBADD = \
$(top_builddir)/glib/libglib-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \
$(NULL)

2
gio/inotify/meson.build
View File

@ -10,6 +10,6 @@ inotify_sources = [
inotify_lib = static_library('inotify', inotify_lib = static_library('inotify',
sources : inotify_sources, sources : inotify_sources,
include_directories : [configinc, glibinc, gmoduleinc], include_directories : [configinc, glibinc, gmoduleinc],
dependencies : [gioenumtypes_dep], dependencies : [gioenumtypes_dep, libglib_dep, libgobject_dep],
pic : true, pic : true,
c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args) c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args)