[glib] gio: fix compiling on macOS by moving all Objective-C file into libgio-objc-2.0



commit 170466db26818ade10862ff405698bb7a97d6d8e
Author: Dr. Michael Lauer <mickey vanille-media de>
Date:   Mon Feb 26 13:08:27 2018 +0100

    gio: fix compiling on macOS by moving all Objective-C file into libgio-objc-2.0
    
    Previously, only gnextstepsettingsbackend.c was taken into account.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=793565

 gio/Makefile.am | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/gio/Makefile.am b/gio/Makefile.am
index e6b232649..67b7fa966 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -289,12 +289,6 @@ unix_sources = \
        $(portal_sources)       \
        $(NULL)
 
-if OS_COCOA
-if MAC_OS_X_9
-unix_sources += gcocoanotificationbackend.c
-endif
-endif
-
 giounixincludedir=$(includedir)/gio-unix-2.0/gio
 giounixinclude_HEADERS = \
        gfiledescriptorbased.h  \
@@ -401,11 +395,6 @@ portal_sources = \
        $(xdp_dbus_built_sources)       \
        $(NULL)
 
-if OS_COCOA
-contenttype_sources += gosxcontenttype.c
-appinfo_sources += gosxappinfo.c gosxappinfo.h
-endif
-
 if OS_UNIX
 if !OS_COCOA
 contenttype_sources += gcontenttype.c
@@ -619,7 +608,12 @@ if OS_COCOA
 libgio_objc_2_0_la_CFLAGS = $(libgio_2_0_la_CFLAGS) -xobjective-c
 libgio_objc_2_0_la_CPPFLAGS = $(libgio_2_0_la_CPPFLAGS)
 libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit
-libgio_objc_2_0_la_SOURCES = gnextstepsettingsbackend.c
+libgio_objc_2_0_la_SOURCES = \
+       gnextstepsettingsbackend.c \
+       gosxcontenttype.c \
+       gosxappinfo.c \
+       gosxappinfo.h \
+       gcocoanotificationbackend.c
 
 noinst_LTLIBRARIES += libgio-objc-2.0.la
 libgio_2_0_la_LIBADD += libgio-objc-2.0.la


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]