[glib] Revert "build: Look for copied Objective-C files in builddir again"
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Revert "build: Look for copied Objective-C files in builddir again"
- Date: Thu, 21 Jun 2018 23:23:08 +0000 (UTC)
commit 04c86912083b6755731d398277dd777f3ccca5c8
Author: Philip Withnall <withnall endlessm com>
Date: Fri Jun 22 00:21:05 2018 +0100
Revert "build: Look for copied Objective-C files in builddir again"
This reverts commit fe72b8772ea74f639f5bbf56b3a51194be0ca78f.
It still fails on GNOME Continuous:
http://build.gnome.org/continuous/buildmaster/builds/2018/06/21/44/build/.
See https://gitlab.gnome.org/GNOME/glib/merge_requests/129 for
discussion.
gio/Makefile.am | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gio/Makefile.am b/gio/Makefile.am
index e8f8fffa3..9dccb6829 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -627,13 +627,13 @@ 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 = \
- $(builddir)/gnextstepsettingsbackend.c \
- $(builddir)/gosxcontenttype.c \
- $(builddir)/gosxappinfo.c \
- $(builddir)/gosxappinfo.h
+ gnextstepsettingsbackend.c \
+ gosxcontenttype.c \
+ gosxappinfo.c \
+ gosxappinfo.h
if MAC_OS_X_9
libgio_objc_2_0_la_SOURCES += \
- $(builddir)/gcocoanotificationbackend.c
+ gcocoanotificationbackend.c
endif
noinst_LTLIBRARIES += libgio-objc-2.0.la
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]