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

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

Browse Source 
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.
This commit is contained in:
Philip Withnall 2018-06-21 11:52:54 +01:00
parent 6e784963f4
commit 03c324c64a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/Makefile.am
View File

@ -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_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_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit
libgio_objc_2_0_la_SOURCES = \ libgio_objc_2_0_la_SOURCES = \
$(abs_builddir)/gnextstepsettingsbackend.c \ gnextstepsettingsbackend.c \
$(abs_builddir)/gosxcontenttype.c \ gosxcontenttype.c \
$(abs_builddir)/gosxappinfo.c \ gosxappinfo.c \
$(abs_builddir)/gosxappinfo.h gosxappinfo.h
if MAC_OS_X_9 if MAC_OS_X_9
libgio_objc_2_0_la_SOURCES += \ libgio_objc_2_0_la_SOURCES += \
$(abs_builddir)/gcocoanotificationbackend.c gcocoanotificationbackend.c
endif endif
noinst_LTLIBRARIES += libgio-objc-2.0.la noinst_LTLIBRARIES += libgio-objc-2.0.la