dconf 0.24.0
[git/cygwin-packages/dconf.git] / 0.22.0-libtool.patch
CommitLineData
8176d706
YS
1--- origsrc/dconf-0.22.0/bin/Makefile.am 2014-03-03 14:58:21.000000000 -0600
2+++ src/dconf-0.22.0/bin/Makefile.am 2015-01-04 13:12:57.985272800 -0600
aebff6b2
YS
3@@ -11,7 +11,7 @@ dconf_CFLAGS = \
4 -w
5
6 dconf_LDADD = \
7- ../client/libdconf.so.1 \
8+ ../client/libdconf.la \
9 $(gio_LIBS)
10
11 dconf_SOURCES = \
8176d706
YS
12--- origsrc/dconf-0.22.0/client/Makefile.am 2014-03-03 14:58:21.000000000 -0600
13+++ src/dconf-0.22.0/client/Makefile.am 2015-01-04 13:12:57.985272800 -0600
aebff6b2
YS
14@@ -1,21 +1,8 @@
15 include $(top_srcdir)/Makefile.gtester
16
17-shlibdir=$(libdir)
18-shlib_PROGRAMS = libdconf.so.1.0.0
19-nodist_noinst_DATA = libdconf.so.1 libdconf.so
20+lib_LTLIBRARIES = libdconf.la
21 noinst_LIBRARIES = libdconf-client.a
22
23-libdconf.so.1 libdconf.so: libdconf.so.1.0.0
24- $(AM_V_GEN) ln -fs libdconf.so.1.0.0 $@
25-
26-install-data-hook:
27- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.1
28- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
29-
30-uninstall-hook:
31- rm -f $(DESTDIR)$(shlibdir)/libdconf.so.1
32- rm -f $(DESTDIR)$(shlibdir)/libdconf.so
33-
34 dconfinclude_HEADERS = dconf.h
35 dconfclientinclude_HEADERS = dconf-client.h
36 dconfclientincludedir = $(dconfincludedir)/client
37@@ -24,16 +11,16 @@ libdconf_client_a_CFLAGS = $(gio_CFLAGS)
38 libdconf_client_a_SOURCES = \
39 dconf-client.c
40
41-libdconf_so_1_0_0_CFLAGS = $(libdconf_client_a_CFLAGS) -fPIC -DPIC
42-libdconf_so_1_0_0_LDADD = \
43- ../engine/libdconf-engine-shared.a \
44- ../common/libdconf-common-shared.a \
45- ../gdbus/libdconf-gdbus-thread-shared.a \
46- ../gvdb/libgvdb-shared.a \
47- ../shm/libdconf-shm-shared.a \
48+libdconf_la_CFLAGS = $(libdconf_client_a_CFLAGS)
49+libdconf_la_LIBADD = \
50+ ../engine/libdconf-engine-shared.la \
51+ ../common/libdconf-common-shared.la \
52+ ../gdbus/libdconf-gdbus-thread-shared.la \
53+ ../gvdb/libgvdb-shared.la \
54+ ../shm/libdconf-shm-shared.la \
55 $(gio_LIBS)
56-libdconf_so_1_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.1
57-libdconf_so_1_0_0_SOURCES = $(libdconf_client_a_SOURCES)
c83b74e9 58+libdconf_la_LDFLAGS = -shared -version-number 1:0:0 -no-undefined
aebff6b2
YS
59+libdconf_la_SOURCES = $(libdconf_client_a_SOURCES)
60
61 EXTRA_DIST = dconf.vapi dconf.deps
62
63@@ -42,5 +29,3 @@ vapidir = $(datadir)/vala/vapi
64
65 pkgconfigdir = $(libdir)/pkgconfig
66 pkgconfig_DATA = dconf.pc
67-
68-CLEANFILES = libdconf.so.1 libdconf.so
8176d706
YS
69--- origsrc/dconf-0.22.0/common/Makefile.am 2014-03-03 14:58:21.000000000 -0600
70+++ src/dconf-0.22.0/common/Makefile.am 2015-01-04 13:12:57.985272800 -0600
71@@ -6,7 +6,8 @@ dconfcommoninclude_HEADERS = \
72 dconf-error.h \
aebff6b2
YS
73 dconf-paths.h
74
75-noinst_LIBRARIES = libdconf-common.a libdconf-common-shared.a libdconf-common-hidden.a
76+noinst_LIBRARIES = libdconf-common.a
77+noinst_LTLIBRARIES = libdconf-common-shared.la libdconf-common-hidden.la
78
c83b74e9 79 libdconf_common_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
aebff6b2 80 libdconf_common_a_SOURCES = \
8176d706
YS
81@@ -14,8 +15,8 @@ libdconf_common_a_SOURCES = \
82 dconf-error.c \
aebff6b2
YS
83 dconf-paths.c
84
85-libdconf_common_shared_a_CFLAGS = $(libdconf_common_a_CFLAGS) -fPIC -DPIC
86-libdconf_common_shared_a_SOURCES = $(libdconf_common_a_SOURCES)
87+libdconf_common_shared_la_CFLAGS = $(libdconf_common_a_CFLAGS)
88+libdconf_common_shared_la_SOURCES = $(libdconf_common_a_SOURCES)
89
90-libdconf_common_hidden_a_CFLAGS = $(libdconf_common_a_CFLAGS) -fPIC -DPIC -fvisibility=hidden
91-libdconf_common_hidden_a_SOURCES = $(libdconf_common_a_SOURCES)
92+libdconf_common_hidden_la_CFLAGS = $(libdconf_common_a_CFLAGS) -fvisibility=hidden
93+libdconf_common_hidden_la_SOURCES = $(libdconf_common_a_SOURCES)
8176d706
YS
94--- origsrc/dconf-0.22.0/configure.ac 2014-09-19 11:23:46.000000000 -0500
95+++ src/dconf-0.22.0/configure.ac 2015-01-04 13:12:57.985272800 -0600
96@@ -21,7 +21,7 @@ AC_PROG_CC
97 AC_CHECK_LIB(c, dlsym, LIBDL="", [AC_CHECK_LIB(dl, dlsym, LIBDL="-ldl")])
98 AC_SUBST(LIBDL)
99 AM_PROG_VALAC([0.18.0])
aebff6b2
YS
100-AC_PROG_RANLIB
101+AC_PROG_LIBTOOL
c83b74e9
YS
102 AC_ARG_ENABLE(man,
103 [AS_HELP_STRING([--enable-man],
104 [generate man pages [default=yes]])],,
8176d706
YS
105--- origsrc/dconf-0.22.0/dbus-1/Makefile.am 2014-03-03 14:58:21.000000000 -0600
106+++ src/dconf-0.22.0/dbus-1/Makefile.am 2015-01-04 13:12:58.000872900 -0600
c83b74e9 107@@ -1,14 +1,15 @@
aebff6b2
YS
108 include $(top_srcdir)/Makefile.gtester
109
110-noinst_LIBRARIES = libdconf-libdbus-1.a libdconf-libdbus-1-shared.a
aebff6b2
YS
111+noinst_LIBRARIES = libdconf-libdbus-1.a
112+noinst_LTLIBRARIES = libdconf-libdbus-1-shared.la
113
c83b74e9 114 libdconf_libdbus_1_a_CFLAGS = $(dbus_CFLAGS) $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
aebff6b2
YS
115 libdconf_libdbus_1_a_SOURCES = \
116 dconf-libdbus-1.h \
117 dconf-libdbus-1.c
118
119-libdconf_libdbus_1_shared_a_CFLAGS = $(libdconf_libdbus_1_a_CFLAGS) -fPIC -DPIC
120-libdconf_libdbus_1_shared_a_SOURCES = $(libdconf_libdbus_1_a_SOURCES)
121+libdconf_libdbus_1_shared_la_CFLAGS = $(libdconf_libdbus_1_a_CFLAGS)
122+libdconf_libdbus_1_shared_la_SOURCES = $(libdconf_libdbus_1_a_SOURCES)
123
124 dconf_dbus_1includedir = $(includedir)/dconf-dbus-1
125 dconf_dbus_1include_HEADERS = dconf-dbus-1.h
c83b74e9 126@@ -16,32 +17,16 @@ dconf_dbus_1include_HEADERS = dconf-dbus
aebff6b2
YS
127 pkgconfigdir = $(libdir)/pkgconfig
128 pkgconfig_DATA = dconf-dbus-1.pc
129
130-shlibdir = $(libdir)
131-shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0
c83b74e9
YS
132+lib_LTLIBRARIES = libdconf-dbus-1.la
133
aebff6b2
YS
134-libdconf_dbus_1_so_0_0_0_CFLAGS = $(dbus_CFLAGS) $(gio_CFLAGS) -fPIC -DPIC
135-libdconf_dbus_1_so_0_0_0_LDADD = \
136- ../engine/libdconf-engine-shared.a \
137- ../common/libdconf-common-hidden.a \
138- ./libdconf-libdbus-1-shared.a \
139- ../gvdb/libgvdb-shared.a \
140- ../shm/libdconf-shm-shared.a \
141+libdconf_dbus_1_la_CFLAGS = $(dbus_CFLAGS) $(gio_CFLAGS)
142+libdconf_dbus_1_la_LIBADD = \
143+ ../engine/libdconf-engine-shared.la \
144+ ../common/libdconf-common-hidden.la \
145+ libdconf-libdbus-1-shared.la \
146+ ../gvdb/libgvdb-shared.la \
147+ ../shm/libdconf-shm-shared.la \
148 $(dbus_LIBS) \
149 $(glib_LIBS)
150-libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0
151-libdconf_dbus_1_so_0_0_0_SOURCES = dconf-dbus-1.c
152-
153-nodist_noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
154-
155-libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0
156- $(AM_V_GEN) ln -fs libdconf-dbus-1.so.0.0.0 $@
157-
158-install-data-hook:
159- ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
160- ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
161-
162-uninstall-hook:
163- rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
164- rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
165-
166-CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
c83b74e9 167+libdconf_dbus_1_la_LDFLAGS = -shared -version-number 0:0:0 -no-undefined
aebff6b2 168+libdconf_dbus_1_la_SOURCES = dconf-dbus-1.c
8176d706
YS
169--- origsrc/dconf-0.22.0/engine/Makefile.am 2014-03-03 14:58:21.000000000 -0600
170+++ src/dconf-0.22.0/engine/Makefile.am 2015-01-04 13:12:58.000872900 -0600
aebff6b2
YS
171@@ -1,6 +1,7 @@
172 include $(top_srcdir)/Makefile.gtester
173
174-noinst_LIBRARIES = libdconf-engine.a libdconf-engine-shared.a
175+noinst_LIBRARIES = libdconf-engine.a
176+noinst_LTLIBRARIES = libdconf-engine-shared.la
177
c83b74e9 178 libdconf_engine_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
aebff6b2 179 libdconf_engine_a_SOURCES = \
8176d706 180@@ -16,5 +17,5 @@ libdconf_engine_a_SOURCES = \
aebff6b2
YS
181 dconf-engine.h \
182 dconf-engine.c
183
184-libdconf_engine_shared_a_CFLAGS = $(libdconf_engine_a_CFLAGS) -fPIC -DPIC
185-libdconf_engine_shared_a_SOURCES = $(libdconf_engine_a_SOURCES)
186+libdconf_engine_shared_la_CFLAGS = $(libdconf_engine_a_CFLAGS)
187+libdconf_engine_shared_la_SOURCES = $(libdconf_engine_a_SOURCES)
8176d706
YS
188--- origsrc/dconf-0.22.0/gdbus/Makefile.am 2014-03-03 14:58:21.000000000 -0600
189+++ src/dconf-0.22.0/gdbus/Makefile.am 2015-01-04 13:12:58.000872900 -0600
aebff6b2
YS
190@@ -2,20 +2,21 @@ include $(top_srcdir)/Makefile.gtester
191
192 noinst_LIBRARIES = \
193 libdconf-gdbus-thread.a \
194- libdconf-gdbus-thread-shared.a \
195- libdconf-gdbus-filter.a \
196- libdconf-gdbus-filter-shared.a
197+ libdconf-gdbus-filter.a
198+noinst_LTLIBRARIES = \
199+ libdconf-gdbus-thread-shared.la \
200+ libdconf-gdbus-filter-shared.la
201
c83b74e9 202 libdconf_gdbus_thread_a_CFLAGS = $(gio_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
aebff6b2
YS
203 libdconf_gdbus_thread_a_SOURCES = \
204 dconf-gdbus-thread.c
205
206-libdconf_gdbus_thread_shared_a_CFLAGS = $(libdconf_gdbus_thread_a_CFLAGS) -fPIC -DPIC
207-libdconf_gdbus_thread_shared_a_SOURCES = $(libdconf_gdbus_thread_a_SOURCES)
208+libdconf_gdbus_thread_shared_la_CFLAGS = $(libdconf_gdbus_thread_a_CFLAGS)
209+libdconf_gdbus_thread_shared_la_SOURCES = $(libdconf_gdbus_thread_a_SOURCES)
210
c83b74e9 211 libdconf_gdbus_filter_a_CFLAGS = $(gio_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
aebff6b2
YS
212 libdconf_gdbus_filter_a_SOURCES = \
213 dconf-gdbus-filter.c
214
215-libdconf_gdbus_filter_shared_a_CFLAGS = $(libdconf_gdbus_filter_a_CFLAGS) -fPIC -DPIC
216-libdconf_gdbus_filter_shared_a_SOURCES = $(libdconf_gdbus_filter_a_SOURCES)
217+libdconf_gdbus_filter_shared_la_CFLAGS = $(libdconf_gdbus_filter_a_CFLAGS)
218+libdconf_gdbus_filter_shared_la_SOURCES = $(libdconf_gdbus_filter_a_SOURCES)
8176d706
YS
219--- origsrc/dconf-0.22.0/gsettings/Makefile.am 2014-03-03 14:58:21.000000000 -0600
220+++ src/dconf-0.22.0/gsettings/Makefile.am 2015-01-04 13:12:58.016472900 -0600
aebff6b2
YS
221@@ -1,18 +1,18 @@
222 include $(top_srcdir)/Makefile.gtester
223
224-giomodules_PROGRAMS = libdconfsettings.so
225+giomodules_LTLIBRARIES = libdconfsettings.la
226
227-libdconfsettings_so_LDADD = \
228- ../engine/libdconf-engine-shared.a \
229- ../gvdb/libgvdb-shared.a \
230- ../gdbus/libdconf-gdbus-thread-shared.a \
231- ../common/libdconf-common-hidden.a \
232- ../shm/libdconf-shm-shared.a \
233+libdconfsettings_la_LIBADD = \
234+ ../engine/libdconf-engine-shared.la \
235+ ../gvdb/libgvdb-shared.la \
236+ ../gdbus/libdconf-gdbus-thread-shared.la \
237+ ../common/libdconf-common-hidden.la \
238+ ../shm/libdconf-shm-shared.la \
239 $(gio_LIBS)
240
c83b74e9 241-libdconfsettings_so_CFLAGS = $(gio_CFLAGS) -fPIC -DPIC -DG_LOG_DOMAIN=\"dconf\"
aebff6b2
YS
242-libdconfsettings_so_LDFLAGS = -shared
243-libdconfsettings_so_SOURCES = \
c83b74e9
YS
244+libdconfsettings_la_CFLAGS = $(gio_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
245+libdconfsettings_la_LDFLAGS = -shared -module -avoid-version -no-undefined
aebff6b2
YS
246+libdconfsettings_la_SOURCES = \
247 dconfsettingsbackend.c
248
249 uninstall-hook:
8176d706
YS
250--- origsrc/dconf-0.22.0/gvdb/Makefile.am 2014-03-03 14:58:21.000000000 -0600
251+++ src/dconf-0.22.0/gvdb/Makefile.am 2015-01-04 13:12:58.016472900 -0600
aebff6b2
YS
252@@ -1,6 +1,7 @@
253 include $(top_srcdir)/Makefile.gtester
254
255-noinst_LIBRARIES = libgvdb.a libgvdb-shared.a
256+noinst_LIBRARIES = libgvdb.a
257+noinst_LTLIBRARIES = libgvdb-shared.la
258
c83b74e9 259 libgvdb_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"gvdb\ \(via\ dconf\)\"
aebff6b2
YS
260 libgvdb_a_SOURCES = \
261@@ -10,5 +11,5 @@ libgvdb_a_SOURCES = \
262 gvdb-reader.h \
263 gvdb-reader.c
264
265-libgvdb_shared_a_CFLAGS = $(libgvdb_a_CFLAGS) -fPIC -DPIC
266-libgvdb_shared_a_SOURCES = $(libgvdb_a_SOURCES)
267+libgvdb_shared_la_CFLAGS = $(libgvdb_a_CFLAGS)
268+libgvdb_shared_la_SOURCES = $(libgvdb_a_SOURCES)
8176d706
YS
269--- origsrc/dconf-0.22.0/shm/Makefile.am 2014-03-03 14:58:21.000000000 -0600
270+++ src/dconf-0.22.0/shm/Makefile.am 2015-01-04 13:12:58.016472900 -0600
aebff6b2
YS
271@@ -1,11 +1,12 @@
272 include $(top_srcdir)/Makefile.gtester
273
274-noinst_LIBRARIES = libdconf-shm.a libdconf-shm-shared.a
275+noinst_LIBRARIES = libdconf-shm.a
276+noinst_LTLIBRARIES = libdconf-shm-shared.la
277
c83b74e9 278 libdconf_shm_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
aebff6b2
YS
279 libdconf_shm_a_SOURCES = \
280 dconf-shm.h \
281 dconf-shm.c
282
283-libdconf_shm_shared_a_CFLAGS = $(libdconf_shm_a_CFLAGS) -fPIC -DPIC
284-libdconf_shm_shared_a_SOURCES = $(libdconf_shm_a_SOURCES)
285+libdconf_shm_shared_la_CFLAGS = $(libdconf_shm_a_CFLAGS)
286+libdconf_shm_shared_la_SOURCES = $(libdconf_shm_a_SOURCES)
This page took 0.048586 seconds and 5 git commands to generate.