| @@ -1,176 +1,181 @@ | | | @@ -1,176 +1,181 @@ |
1 | $NetBSD: patch-an,v 1.18 2018/05/21 08:39:38 jperkin Exp $ | | 1 | $NetBSD: patch-an,v 1.19 2018/08/19 18:32:27 wiz Exp $ |
2 | | | 2 | |
3 | - Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package. | | 3 | - Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package. |
4 | - Don't compile tests as they include gdbus-codegen tests. | | 4 | - Don't compile tests as they include gdbus-codegen tests. |
5 | - Don't install completion data. | | 5 | - Don't install completion data. |
6 | - Re-enable gdesktopappinfo on Darwin. | | 6 | - Re-enable gdesktopappinfo on Darwin. |
7 | | | 7 | |
8 | --- gio/Makefile.in.orig 2018-04-07 02:37:14.000000000 +0000 | | 8 | --- gio/Makefile.in.orig 2018-08-17 00:27:41.000000000 +0000 |
9 | +++ gio/Makefile.in | | 9 | +++ gio/Makefile.in |
10 | @@ -175,7 +175,7 @@ TESTS = $(am__EXEEXT_2) | | 10 | @@ -175,7 +175,7 @@ TESTS = $(am__EXEEXT_2) |
11 | @HAVE_FAM_TRUE@am__append_27 = fam | | 11 | @HAVE_FAM_TRUE@am__append_27 = fam |
12 | @OS_UNIX_TRUE@am__append_28 = xdgmime/libxdgmime.la | | 12 | @OS_UNIX_TRUE@am__append_28 = xdgmime/libxdgmime.la |
13 | @OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la | | 13 | @OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la |
14 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_30 = gdesktopappinfo.h | | 14 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_30 = gdesktopappinfo.h |
15 | +@OS_UNIX_TRUE@am__append_30 = gdesktopappinfo.h | | 15 | +@OS_UNIX_TRUE@am__append_30 = gdesktopappinfo.h |
16 | @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_31 = \ | | 16 | @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_31 = \ |
17 | @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.c \ | | 17 | @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.c \ |
18 | @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.h \ | | 18 | @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.h \ |
19 | @@ -186,8 +186,8 @@ TESTS = $(am__EXEEXT_2) | | 19 | @@ -186,8 +186,8 @@ TESTS = $(am__EXEEXT_2) |
20 | @OS_WIN32_TRUE@am__append_32 = gwin32appinfo.c gwin32appinfo.h | | 20 | @OS_WIN32_TRUE@am__append_32 = gwin32appinfo.c gwin32appinfo.h |
21 | @OS_WIN32_TRUE@am__append_33 = gcontenttype-win32.c | | 21 | @OS_WIN32_TRUE@am__append_33 = gcontenttype-win32.c |
22 | @OS_WIN32_TRUE@am__append_34 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi | | 22 | @OS_WIN32_TRUE@am__append_34 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi |
23 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_35 = gcontenttype.c | | 23 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_35 = gcontenttype.c |
24 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.c | | 24 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.c |
25 | +@OS_UNIX_TRUE@am__append_35 = gcontenttype.c | | 25 | +@OS_UNIX_TRUE@am__append_35 = gcontenttype.c |
26 | +@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.c | | 26 | +@OS_UNIX_TRUE@am__append_36 = gdesktopappinfo.c |
27 | @OS_COCOA_TRUE@am__append_37 = libgio-objc-2.0.la | | 27 | @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@am__append_37 = \ |
28 | @OS_COCOA_TRUE@am__append_38 = libgio-objc-2.0.la | | 28 | @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@ gcocoanotificationbackend.c |
29 | @HAVE_LIBMOUNT_TRUE@am__append_39 = $(LIBMOUNT_CFLAGS) | | 29 | |
30 | @@ -202,7 +202,7 @@ bin_PROGRAMS = gio-querymodules$(EXEEXT) | | 30 | @@ -205,7 +205,7 @@ bin_PROGRAMS = gio-querymodules$(EXEEXT) |
31 | | | 31 | |
32 | # ------------------------------------------------------------------------ | | 32 | # ------------------------------------------------------------------------ |
33 | # gapplication(1) tool | | 33 | # gapplication(1) tool |
34 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_45 = gapplication | | 34 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_46 = gapplication |
35 | +@OS_UNIX_TRUE@am__append_45 = gapplication | | 35 | +@OS_UNIX_TRUE@am__append_46 = gapplication |
36 | subdir = gio | | 36 | subdir = gio |
37 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | | 37 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
38 | am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \ | | 38 | am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \ |
39 | @@ -526,11 +526,10 @@ am__objects_5 = libgio_2_0_la-gappinfo.l | | 39 | @@ -231,7 +231,7 @@ mkinstalldirs = $(install_sh) -d |
| | | 40 | CONFIG_HEADER = $(top_builddir)/config.h |
| | | 41 | CONFIG_CLEAN_FILES = gnetworking.h gio.rc |
| | | 42 | CONFIG_CLEAN_VPATH_FILES = |
| | | 43 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT) |
| | | 44 | +@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT) |
| | | 45 | am__installdirs = "$(DESTDIR)$(bindir)" \ |
| | | 46 | "$(DESTDIR)$(installed_testdir)" \ |
| | | 47 | "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(libdir)" \ |
| | | 48 | @@ -535,11 +535,10 @@ am__objects_5 = libgio_2_0_la-gappinfo.l |
40 | libgio_2_0_la-gliststore.lo $(am__objects_2) $(am__objects_3) \ | | 49 | libgio_2_0_la-gliststore.lo $(am__objects_2) $(am__objects_3) \ |
41 | $(am__objects_4) $(am__objects_1) | | 50 | $(am__objects_4) $(am__objects_1) |
42 | @OS_WIN32_TRUE@am__objects_6 = libgio_2_0_la-gwin32appinfo.lo | | 51 | @OS_WIN32_TRUE@am__objects_6 = libgio_2_0_la-gwin32appinfo.lo |
43 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gdesktopappinfo.lo | | 52 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gdesktopappinfo.lo |
44 | +@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gdesktopappinfo.lo | | 53 | +@OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gdesktopappinfo.lo |
45 | am__objects_8 = $(am__objects_6) $(am__objects_7) | | 54 | am__objects_8 = $(am__objects_6) $(am__objects_7) |
46 | @OS_WIN32_TRUE@am__objects_9 = libgio_2_0_la-gcontenttype-win32.lo | | 55 | @OS_WIN32_TRUE@am__objects_9 = libgio_2_0_la-gcontenttype-win32.lo |
47 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_10 = \ | | 56 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_10 = \ |
48 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ libgio_2_0_la-gcontenttype.lo | | 57 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ libgio_2_0_la-gcontenttype.lo |
49 | +@OS_UNIX_TRUE@am__objects_10 = libgio_2_0_la-gcontenttype.lo | | 58 | +@OS_UNIX_TRUE@am__objects_10 = libgio_2_0_la-gcontenttype.lo |
50 | am__objects_11 = $(am__objects_9) $(am__objects_10) | | 59 | am__objects_11 = $(am__objects_9) $(am__objects_10) |
51 | am__objects_12 = libgio_2_0_la-xdp-dbus.lo | | 60 | am__objects_12 = libgio_2_0_la-xdp-dbus.lo |
52 | am__objects_13 = libgio_2_0_la-gnetworkmonitorportal.lo \ | | 61 | am__objects_13 = libgio_2_0_la-gnetworkmonitorportal.lo \ |
53 | @@ -594,12 +593,9 @@ libgio_2_0_la_LINK = $(LIBTOOL) $(AM_V_l | | 62 | @@ -603,13 +602,10 @@ libgio_2_0_la_LINK = $(LIBTOOL) $(AM_V_l |
54 | $(CFLAGS) $(libgio_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ | | 63 | $(CFLAGS) $(libgio_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ |
55 | libgio_objc_2_0_la_LIBADD = | | 64 | libgio_objc_2_0_la_LIBADD = |
56 | am__libgio_objc_2_0_la_SOURCES_DIST = gnextstepsettingsbackend.c \ | | 65 | am__libgio_objc_2_0_la_SOURCES_DIST = gnextstepsettingsbackend.c \ |
57 | - gosxcontenttype.c gosxappinfo.c gosxappinfo.h \ | | 66 | - gosxcontenttype.c gosxappinfo.c gosxappinfo.h \ |
58 | gcocoanotificationbackend.c | | 67 | gcocoanotificationbackend.c |
| | | 68 | @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@am__objects_23 = libgio_objc_2_0_la-gcocoanotificationbackend.lo |
59 | @OS_COCOA_TRUE@am_libgio_objc_2_0_la_OBJECTS = \ | | 69 | @OS_COCOA_TRUE@am_libgio_objc_2_0_la_OBJECTS = \ |
60 | @OS_COCOA_TRUE@ libgio_objc_2_0_la-gnextstepsettingsbackend.lo \ | | 70 | @OS_COCOA_TRUE@ libgio_objc_2_0_la-gnextstepsettingsbackend.lo \ |
61 | -@OS_COCOA_TRUE@ libgio_objc_2_0_la-gosxcontenttype.lo \ | | 71 | -@OS_COCOA_TRUE@ libgio_objc_2_0_la-gosxcontenttype.lo \ |
62 | -@OS_COCOA_TRUE@ libgio_objc_2_0_la-gosxappinfo.lo \ | | 72 | -@OS_COCOA_TRUE@ libgio_objc_2_0_la-gosxappinfo.lo \ |
63 | @OS_COCOA_TRUE@ libgio_objc_2_0_la-gcocoanotificationbackend.lo | | 73 | @OS_COCOA_TRUE@ $(am__objects_23) |
64 | libgio_objc_2_0_la_OBJECTS = $(am_libgio_objc_2_0_la_OBJECTS) | | 74 | libgio_objc_2_0_la_OBJECTS = $(am_libgio_objc_2_0_la_OBJECTS) |
65 | libgio_objc_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | | 75 | libgio_objc_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ |
66 | @@ -607,22 +603,20 @@ libgio_objc_2_0_la_LINK = $(LIBTOOL) $(A | | 76 | @@ -618,15 +614,15 @@ libgio_objc_2_0_la_LINK = $(LIBTOOL) $(A |
67 | $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) \ | | | |
68 | $(libgio_objc_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ | | 77 | $(libgio_objc_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ |
69 | @OS_COCOA_TRUE@am_libgio_objc_2_0_la_rpath = | | 78 | @OS_COCOA_TRUE@am_libgio_objc_2_0_la_rpath = |
70 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT) | | | |
71 | +@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT) | | | |
72 | am__EXEEXT_2 = | | | |
73 | @ENABLE_ALWAYS_BUILD_TESTS_FALSE@am__EXEEXT_3 = $(am__EXEEXT_2) | | | |
74 | @ENABLE_ALWAYS_BUILD_TESTS_TRUE@am__EXEEXT_4 = $(am__EXEEXT_2) | | | |
75 | PROGRAMS = $(bin_PROGRAMS) $(installed_test_PROGRAMS) \ | | | |
76 | $(noinst_PROGRAMS) | | | |
77 | am__gapplication_SOURCES_DIST = gapplication-tool.c | | 79 | am__gapplication_SOURCES_DIST = gapplication-tool.c |
78 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am_gapplication_OBJECTS = \ | | 80 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@am_gapplication_OBJECTS = \ |
79 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ gapplication-tool.$(OBJEXT) | | 81 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ gapplication-tool.$(OBJEXT) |
80 | +@OS_UNIX_TRUE@am_gapplication_OBJECTS = gapplication-tool.$(OBJEXT) | | 82 | +@OS_UNIX_TRUE@am_gapplication_OBJECTS = \ |
| | | 83 | +@OS_UNIX_TRUE@ gapplication-tool.$(OBJEXT) |
81 | gapplication_OBJECTS = $(am_gapplication_OBJECTS) | | 84 | gapplication_OBJECTS = $(am_gapplication_OBJECTS) |
82 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_DEPENDENCIES = \ | | 85 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_DEPENDENCIES = \ |
83 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ libgio-2.0.la \ | | 86 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ libgio-2.0.la \ |
84 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \ | | 87 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \ |
85 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \ | | 88 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \ |
86 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \ | | 89 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \ |
87 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(am__DEPENDENCIES_1) | | 90 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(am__DEPENDENCIES_1) |
88 | +@OS_UNIX_TRUE@gapplication_DEPENDENCIES = libgio-2.0.la \ | | 91 | +@OS_UNIX_TRUE@gapplication_DEPENDENCIES = \ |
| | | 92 | +@OS_UNIX_TRUE@ libgio-2.0.la \ |
89 | +@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \ | | 93 | +@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \ |
90 | +@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \ | | 94 | +@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \ |
91 | +@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \ | | 95 | +@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \ |
92 | +@OS_UNIX_TRUE@ $(am__DEPENDENCIES_1) | | 96 | +@OS_UNIX_TRUE@ $(am__DEPENDENCIES_1) |
93 | am_gdbus_OBJECTS = gdbus-tool.$(OBJEXT) | | 97 | am_gdbus_OBJECTS = gdbus-tool.$(OBJEXT) |
94 | gdbus_OBJECTS = $(am_gdbus_OBJECTS) | | 98 | gdbus_OBJECTS = $(am_gdbus_OBJECTS) |
95 | gdbus_DEPENDENCIES = libgio-2.0.la \ | | 99 | gdbus_DEPENDENCIES = libgio-2.0.la \ |
96 | @@ -945,8 +939,7 @@ am__set_b = \ | | 100 | @@ -1189,8 +1185,7 @@ am__set_b = \ |
97 | *) \ | | 101 | *) \ |
98 | b='$*';; \ | | 102 | b='$*';; \ |
99 | esac | | 103 | esac |
100 | -DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue win32 . tests \ | | 104 | -DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue win32 . tests \ |
101 | - fam | | 105 | - fam |
102 | +DIST_SUBDIRS = xdgmime inotify kqueue win32 . fam | | 106 | +DIST_SUBDIRS = xdgmime inotify kqueue win32 . fam |
103 | am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gio.rc.in \ | | 107 | am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gio.rc.in \ |
104 | $(srcdir)/gnetworking.h.in $(top_srcdir)/depcomp \ | | 108 | $(srcdir)/gnetworking.h.in $(top_srcdir)/depcomp \ |
105 | $(top_srcdir)/glib.mk $(top_srcdir)/test-driver \ | | 109 | $(top_srcdir)/glib.mk $(top_srcdir)/test-driver \ |
106 | @@ -1050,6 +1043,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ | | 110 | @@ -1294,6 +1289,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
107 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ | | 111 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
108 | GTKDOC_REBASE = @GTKDOC_REBASE@ | | 112 | GTKDOC_REBASE = @GTKDOC_REBASE@ |
109 | G_LIBS_EXTRA = @G_LIBS_EXTRA@ | | 113 | G_LIBS_EXTRA = @G_LIBS_EXTRA@ |
110 | +G_MODULE_BROKEN_DLOPEN_NULL = @G_MODULE_BROKEN_DLOPEN_NULL@ | | 114 | +G_MODULE_BROKEN_DLOPEN_NULL = @G_MODULE_BROKEN_DLOPEN_NULL@ |
111 | G_MODULE_BROKEN_RTLD_GLOBAL = @G_MODULE_BROKEN_RTLD_GLOBAL@ | | 115 | G_MODULE_BROKEN_RTLD_GLOBAL = @G_MODULE_BROKEN_RTLD_GLOBAL@ |
112 | G_MODULE_HAVE_DLERROR = @G_MODULE_HAVE_DLERROR@ | | 116 | G_MODULE_HAVE_DLERROR = @G_MODULE_HAVE_DLERROR@ |
113 | G_MODULE_IMPL = @G_MODULE_IMPL@ | | 117 | G_MODULE_IMPL = @G_MODULE_IMPL@ |
114 | @@ -1327,8 +1321,8 @@ all_test_ltlibs = $(test_ltlibraries) $( | | 118 | @@ -1571,8 +1567,8 @@ all_test_ltlibs = $(test_ltlibraries) $( |
115 | @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts) | | 119 | @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts) |
116 | | | 120 | |
117 | @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test) | | 121 | @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test) |
118 | -SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_18) \ | | 122 | -SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_18) \ |
119 | - $(am__append_21) $(am__append_24) . tests $(am__append_27) | | 123 | - $(am__append_21) $(am__append_24) . tests $(am__append_27) |
120 | +SUBDIRS = $(am__append_15) $(am__append_18) $(am__append_21) \ | | 124 | +SUBDIRS = $(am__append_15) $(am__append_18) $(am__append_21) \ |
121 | + $(am__append_24) . $(am__append_27) | | 125 | + $(am__append_24) . $(am__append_27) |
122 | @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir) | | 126 | @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir) |
123 | @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib | | 127 | @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib |
124 | AM_CPPFLAGS = \ | | 128 | AM_CPPFLAGS = \ |
125 | @@ -1793,9 +1787,6 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAG | | 129 | @@ -2036,8 +2032,8 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAG |
| | | 130 | @OS_COCOA_TRUE@libgio_objc_2_0_la_CPPFLAGS = $(libgio_2_0_la_CPPFLAGS) |
126 | @OS_COCOA_TRUE@libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit | | 131 | @OS_COCOA_TRUE@libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit |
127 | @OS_COCOA_TRUE@libgio_objc_2_0_la_SOURCES = \ | | 132 | @OS_COCOA_TRUE@libgio_objc_2_0_la_SOURCES = \ |
128 | @OS_COCOA_TRUE@ gnextstepsettingsbackend.c \ | | 133 | -@OS_COCOA_TRUE@ gnextstepsettingsbackend.c gosxcontenttype.c \ |
129 | -@OS_COCOA_TRUE@ gosxcontenttype.c \ | | 134 | -@OS_COCOA_TRUE@ gosxappinfo.c gosxappinfo.h $(am__append_37) |
130 | -@OS_COCOA_TRUE@ gosxappinfo.c \ | | 135 | +@OS_COCOA_TRUE@ gnextstepsettingsbackend.c \ |
131 | -@OS_COCOA_TRUE@ gosxappinfo.h \ | | 136 | +@OS_COCOA_TRUE@ $(am__append_37) |
132 | @OS_COCOA_TRUE@ gcocoanotificationbackend.c | | | |
133 | | | | |
134 | EXTRA_libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps) | | 137 | EXTRA_libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps) |
135 | @@ -1966,12 +1957,12 @@ gdbus_LDADD = libgio-2.0.la \ | | 138 | gio_headers = \ |
| | | 139 | gappinfo.h \ |
| | | 140 | @@ -2206,12 +2202,12 @@ gdbus_LDADD = libgio-2.0.la \ |
136 | $(top_builddir)/glib/libglib-2.0.la \ | | 141 | $(top_builddir)/glib/libglib-2.0.la \ |
137 | $(NULL) | | 142 | $(NULL) |
138 | | | 143 | |
139 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c | | 144 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c |
140 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la \ | | 145 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la \ |
141 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \ | | 146 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \ |
142 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \ | | 147 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \ |
143 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \ | | 148 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \ |
144 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(NULL) | | 149 | -@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(NULL) |
145 | +@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c | | 150 | +@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c |
146 | +@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la \ | | 151 | +@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la \ |
147 | +@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \ | | 152 | +@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \ |
148 | +@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \ | | 153 | +@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \ |
149 | +@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \ | | 154 | +@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \ |
150 | +@OS_UNIX_TRUE@ $(NULL) | | 155 | +@OS_UNIX_TRUE@ $(NULL) |
151 | | | 156 | |
152 | completiondir = $(datadir)/bash-completion/completions | | 157 | completiondir = $(datadir)/bash-completion/completions |
153 | completion_DATA = \ | | 158 | completion_DATA = \ |
154 | @@ -2637,8 +2628,6 @@ distclean-compile: | | 159 | @@ -2877,8 +2873,6 @@ distclean-compile: |
155 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-xdp-dbus.Plo@am__quote@ | | 160 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-xdp-dbus.Plo@am__quote@ # am--include-marker |
156 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Plo@am__quote@ | | 161 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gcocoanotificationbackend.Plo@am__quote@ # am--include-marker |
157 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gnextstepsettingsbackend.Plo@am__quote@ | | 162 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gnextstepsettingsbackend.Plo@am__quote@ # am--include-marker |
158 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo@am__quote@ | | 163 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo@am__quote@ # am--include-marker |
159 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo@am__quote@ | | 164 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo@am__quote@ # am--include-marker |
160 | @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/gvdb-builder.Po@am__quote@ | | 165 | @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/gvdb-builder.Po@am__quote@ # am--include-marker |
161 | @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/libgio_2_0_la-gvdb-reader.Plo@am__quote@ | | 166 | @AMDEP_TRUE@@am__include@ @am__quote@gvdb/$(DEPDIR)/libgio_2_0_la-gvdb-reader.Plo@am__quote@ # am--include-marker |
162 | | | 167 | |
163 | @@ -4213,20 +4202,6 @@ libgio_objc_2_0_la-gnextstepsettingsback | | 168 | @@ -4459,20 +4453,6 @@ libgio_objc_2_0_la-gnextstepsettingsback |
164 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | | 169 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
165 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_objc_2_0_la-gnextstepsettingsbackend.lo `test -f 'gnextstepsettingsbackend.c' || echo '$(srcdir)/'`gnextstepsettingsbackend.c | | 170 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_objc_2_0_la-gnextstepsettingsbackend.lo `test -f 'gnextstepsettingsbackend.c' || echo '$(srcdir)/'`gnextstepsettingsbackend.c |
166 | | | 171 | |
167 | -libgio_objc_2_0_la-gosxcontenttype.lo: gosxcontenttype.c | | 172 | -libgio_objc_2_0_la-gosxcontenttype.lo: gosxcontenttype.c |
168 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_objc_2_0_la-gosxcontenttype.lo -MD -MP -MF $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Tpo -c -o libgio_objc_2_0_la-gosxcontenttype.lo `test -f 'gosxcontenttype.c' || echo '$(srcdir)/'`gosxcontenttype.c | | 173 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_objc_2_0_la-gosxcontenttype.lo -MD -MP -MF $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Tpo -c -o libgio_objc_2_0_la-gosxcontenttype.lo `test -f 'gosxcontenttype.c' || echo '$(srcdir)/'`gosxcontenttype.c |
169 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Tpo $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo | | 174 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Tpo $(DEPDIR)/libgio_objc_2_0_la-gosxcontenttype.Plo |
170 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gosxcontenttype.c' object='libgio_objc_2_0_la-gosxcontenttype.lo' libtool=yes @AMDEPBACKSLASH@ | | 175 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gosxcontenttype.c' object='libgio_objc_2_0_la-gosxcontenttype.lo' libtool=yes @AMDEPBACKSLASH@ |
171 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | | 176 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
172 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_objc_2_0_la-gosxcontenttype.lo `test -f 'gosxcontenttype.c' || echo '$(srcdir)/'`gosxcontenttype.c | | 177 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_objc_2_0_la-gosxcontenttype.lo `test -f 'gosxcontenttype.c' || echo '$(srcdir)/'`gosxcontenttype.c |
173 | - | | 178 | - |
174 | -libgio_objc_2_0_la-gosxappinfo.lo: gosxappinfo.c | | 179 | -libgio_objc_2_0_la-gosxappinfo.lo: gosxappinfo.c |
175 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_objc_2_0_la-gosxappinfo.lo -MD -MP -MF $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Tpo -c -o libgio_objc_2_0_la-gosxappinfo.lo `test -f 'gosxappinfo.c' || echo '$(srcdir)/'`gosxappinfo.c | | 180 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_objc_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_objc_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_objc_2_0_la-gosxappinfo.lo -MD -MP -MF $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Tpo -c -o libgio_objc_2_0_la-gosxappinfo.lo `test -f 'gosxappinfo.c' || echo '$(srcdir)/'`gosxappinfo.c |
176 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Tpo $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo | | 181 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Tpo $(DEPDIR)/libgio_objc_2_0_la-gosxappinfo.Plo |