luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-06 16:08:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename objective-c files from .c to .m

Browse Source 
Those files got renamed to .c to work around an automake issue, but
Meson needs them to have .m extension. Better rename them at build time
in Makefile.am since that's where the workaround is needed.

https://bugzilla.gnome.org/show_bug.cgi?id=672777
This commit is contained in:
Xavier Claessens
2018-05-17 15:15:22 -04:00
parent 458b6288bf
commit e400af99d4
6 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gio/meson.build
View File

@@ -292,11 +292,6 @@ if host_system == 'windows'
settings_sources += files('gregistrysettingsbackend.c')
endif
# FIXME:
#if OS_COCOA
#settings_sources += files('gnextstepsettingsbackend.c')
#endif
application_headers = files(
'gapplication.h',
'gapplicationcommandline.h',
@@ -412,10 +407,11 @@ if host_system != 'windows'
)
if glib_have_cocoa
contenttype_sources += files('gosxcontenttype.c')
appinfo_sources += files('gosxappinfo.c')
settings_sources += files('gnextstepsettingsbackend.m')
contenttype_sources += files('gosxcontenttype.m')
appinfo_sources += files('gosxappinfo.m')
if glib_have_os_x_9_or_later
unix_sources += files('gcocoanotificationbackend.c')
unix_sources += files('gcocoanotificationbackend.m')
endif
else
contenttype_sources += files('gcontenttype.c')