[glib] Revert "build: Look for copied Objective-C files in builddir"



commit 03c324c64afdd0a754dda549acbab2d6fd68f459
Author: Philip Withnall <withnall endlessm com>
Date:   Thu Jun 21 11:52:54 2018 +0100

    Revert "build: Look for copied Objective-C files in builddir"
    
    This reverts commit e004d5f397eb5a85b39273dbe578be99ea66d92f.
    
    It broke the GNOME Continuous build, which uses autotools. This wasn’t
    caught by CI because we don’t do an autotools CI build.
    
    http://build.gnome.org/continuous/buildmaster/builds/2018/06/21/19/build/
    
    Discussion in https://gitlab.gnome.org/GNOME/glib/merge_requests/127.

 gio/Makefile.am | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 24651e5cf..8a70bf98c 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 = \
-       $(abs_builddir)/gnextstepsettingsbackend.c \
-       $(abs_builddir)/gosxcontenttype.c \
-       $(abs_builddir)/gosxappinfo.c \
-       $(abs_builddir)/gosxappinfo.h
+       gnextstepsettingsbackend.c \
+       gosxcontenttype.c \
+       gosxappinfo.c \
+       gosxappinfo.h
 if MAC_OS_X_9
 libgio_objc_2_0_la_SOURCES += \
-       $(abs_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]