[glib: 1/2] build: Look for copied Objective-C files in builddir again



commit fe72b8772ea74f639f5bbf56b3a51194be0ca78f
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Jun 21 14:48:29 2018 -0700

    build: Look for copied Objective-C files in builddir again
    
    This reverts commit 03c324c64afdd0a754dda549acbab2d6fd68f459 and fixes
    the original problem with e004d5f397eb5a85b39273dbe578be99ea66d92f that
    caused the revert.
    
    We use $(builddir) instead of $(abs_builddir) so that Automake's
    dependency generation works correctly.
    
    See !127.

 gio/Makefile.am | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 9dccb6829..e8f8fffa3 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 = \
-       gnextstepsettingsbackend.c \
-       gosxcontenttype.c \
-       gosxappinfo.c \
-       gosxappinfo.h
+       $(builddir)/gnextstepsettingsbackend.c \
+       $(builddir)/gosxcontenttype.c \
+       $(builddir)/gosxappinfo.c \
+       $(builddir)/gosxappinfo.h
 if MAC_OS_X_9
 libgio_objc_2_0_la_SOURCES += \
-       gcocoanotificationbackend.c
+       $(builddir)/gcocoanotificationbackend.c
 endif
 
 noinst_LTLIBRARIES += libgio-objc-2.0.la


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