dconf 0.26.1
[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/engine/Makefile.am 2014-03-03 14:58:21.000000000 -0600
106+++ src/dconf-0.22.0/engine/Makefile.am 2015-01-04 13:12:58.000872900 -0600
aebff6b2
YS
107@@ -1,6 +1,7 @@
108 include $(top_srcdir)/Makefile.gtester
109
110-noinst_LIBRARIES = libdconf-engine.a libdconf-engine-shared.a
111+noinst_LIBRARIES = libdconf-engine.a
112+noinst_LTLIBRARIES = libdconf-engine-shared.la
113
c83b74e9 114 libdconf_engine_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
aebff6b2 115 libdconf_engine_a_SOURCES = \
8176d706 116@@ -16,5 +17,5 @@ libdconf_engine_a_SOURCES = \
aebff6b2
YS
117 dconf-engine.h \
118 dconf-engine.c
119
120-libdconf_engine_shared_a_CFLAGS = $(libdconf_engine_a_CFLAGS) -fPIC -DPIC
121-libdconf_engine_shared_a_SOURCES = $(libdconf_engine_a_SOURCES)
122+libdconf_engine_shared_la_CFLAGS = $(libdconf_engine_a_CFLAGS)
123+libdconf_engine_shared_la_SOURCES = $(libdconf_engine_a_SOURCES)
8176d706
YS
124--- origsrc/dconf-0.22.0/gdbus/Makefile.am 2014-03-03 14:58:21.000000000 -0600
125+++ src/dconf-0.22.0/gdbus/Makefile.am 2015-01-04 13:12:58.000872900 -0600
aebff6b2
YS
126@@ -2,20 +2,21 @@ include $(top_srcdir)/Makefile.gtester
127
128 noinst_LIBRARIES = \
129 libdconf-gdbus-thread.a \
130- libdconf-gdbus-thread-shared.a \
131- libdconf-gdbus-filter.a \
132- libdconf-gdbus-filter-shared.a
133+ libdconf-gdbus-filter.a
134+noinst_LTLIBRARIES = \
135+ libdconf-gdbus-thread-shared.la \
136+ libdconf-gdbus-filter-shared.la
137
c83b74e9 138 libdconf_gdbus_thread_a_CFLAGS = $(gio_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
aebff6b2
YS
139 libdconf_gdbus_thread_a_SOURCES = \
140 dconf-gdbus-thread.c
141
142-libdconf_gdbus_thread_shared_a_CFLAGS = $(libdconf_gdbus_thread_a_CFLAGS) -fPIC -DPIC
143-libdconf_gdbus_thread_shared_a_SOURCES = $(libdconf_gdbus_thread_a_SOURCES)
144+libdconf_gdbus_thread_shared_la_CFLAGS = $(libdconf_gdbus_thread_a_CFLAGS)
145+libdconf_gdbus_thread_shared_la_SOURCES = $(libdconf_gdbus_thread_a_SOURCES)
146
c83b74e9 147 libdconf_gdbus_filter_a_CFLAGS = $(gio_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
aebff6b2
YS
148 libdconf_gdbus_filter_a_SOURCES = \
149 dconf-gdbus-filter.c
150
151-libdconf_gdbus_filter_shared_a_CFLAGS = $(libdconf_gdbus_filter_a_CFLAGS) -fPIC -DPIC
152-libdconf_gdbus_filter_shared_a_SOURCES = $(libdconf_gdbus_filter_a_SOURCES)
153+libdconf_gdbus_filter_shared_la_CFLAGS = $(libdconf_gdbus_filter_a_CFLAGS)
154+libdconf_gdbus_filter_shared_la_SOURCES = $(libdconf_gdbus_filter_a_SOURCES)
8176d706
YS
155--- origsrc/dconf-0.22.0/gsettings/Makefile.am 2014-03-03 14:58:21.000000000 -0600
156+++ src/dconf-0.22.0/gsettings/Makefile.am 2015-01-04 13:12:58.016472900 -0600
aebff6b2
YS
157@@ -1,18 +1,18 @@
158 include $(top_srcdir)/Makefile.gtester
159
160-giomodules_PROGRAMS = libdconfsettings.so
161+giomodules_LTLIBRARIES = libdconfsettings.la
162
163-libdconfsettings_so_LDADD = \
164- ../engine/libdconf-engine-shared.a \
165- ../gvdb/libgvdb-shared.a \
166- ../gdbus/libdconf-gdbus-thread-shared.a \
167- ../common/libdconf-common-hidden.a \
168- ../shm/libdconf-shm-shared.a \
169+libdconfsettings_la_LIBADD = \
170+ ../engine/libdconf-engine-shared.la \
171+ ../gvdb/libgvdb-shared.la \
172+ ../gdbus/libdconf-gdbus-thread-shared.la \
173+ ../common/libdconf-common-hidden.la \
174+ ../shm/libdconf-shm-shared.la \
175 $(gio_LIBS)
176
c83b74e9 177-libdconfsettings_so_CFLAGS = $(gio_CFLAGS) -fPIC -DPIC -DG_LOG_DOMAIN=\"dconf\"
aebff6b2
YS
178-libdconfsettings_so_LDFLAGS = -shared
179-libdconfsettings_so_SOURCES = \
c83b74e9
YS
180+libdconfsettings_la_CFLAGS = $(gio_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
181+libdconfsettings_la_LDFLAGS = -shared -module -avoid-version -no-undefined
aebff6b2
YS
182+libdconfsettings_la_SOURCES = \
183 dconfsettingsbackend.c
184
185 uninstall-hook:
8176d706
YS
186--- origsrc/dconf-0.22.0/gvdb/Makefile.am 2014-03-03 14:58:21.000000000 -0600
187+++ src/dconf-0.22.0/gvdb/Makefile.am 2015-01-04 13:12:58.016472900 -0600
aebff6b2
YS
188@@ -1,6 +1,7 @@
189 include $(top_srcdir)/Makefile.gtester
190
191-noinst_LIBRARIES = libgvdb.a libgvdb-shared.a
192+noinst_LIBRARIES = libgvdb.a
193+noinst_LTLIBRARIES = libgvdb-shared.la
194
c83b74e9 195 libgvdb_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"gvdb\ \(via\ dconf\)\"
aebff6b2
YS
196 libgvdb_a_SOURCES = \
197@@ -10,5 +11,5 @@ libgvdb_a_SOURCES = \
198 gvdb-reader.h \
199 gvdb-reader.c
200
201-libgvdb_shared_a_CFLAGS = $(libgvdb_a_CFLAGS) -fPIC -DPIC
202-libgvdb_shared_a_SOURCES = $(libgvdb_a_SOURCES)
203+libgvdb_shared_la_CFLAGS = $(libgvdb_a_CFLAGS)
204+libgvdb_shared_la_SOURCES = $(libgvdb_a_SOURCES)
8176d706
YS
205--- origsrc/dconf-0.22.0/shm/Makefile.am 2014-03-03 14:58:21.000000000 -0600
206+++ src/dconf-0.22.0/shm/Makefile.am 2015-01-04 13:12:58.016472900 -0600
aebff6b2
YS
207@@ -1,11 +1,12 @@
208 include $(top_srcdir)/Makefile.gtester
209
210-noinst_LIBRARIES = libdconf-shm.a libdconf-shm-shared.a
211+noinst_LIBRARIES = libdconf-shm.a
212+noinst_LTLIBRARIES = libdconf-shm-shared.la
213
c83b74e9 214 libdconf_shm_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
aebff6b2
YS
215 libdconf_shm_a_SOURCES = \
216 dconf-shm.h \
217 dconf-shm.c
218
219-libdconf_shm_shared_a_CFLAGS = $(libdconf_shm_a_CFLAGS) -fPIC -DPIC
220-libdconf_shm_shared_a_SOURCES = $(libdconf_shm_a_SOURCES)
221+libdconf_shm_shared_la_CFLAGS = $(libdconf_shm_a_CFLAGS)
222+libdconf_shm_shared_la_SOURCES = $(libdconf_shm_a_SOURCES)
This page took 0.19235 seconds and 5 git commands to generate.