gnome/dconf 0.6
[git/cygwin-packages/dconf.git] / 0.6-libtool.patch
CommitLineData
29f084c7
YS
1--- origsrc/dconf-0.6/bin/Makefile.am 2010-08-03 15:24:14.000000000 -0500
2+++ src/dconf-0.6/bin/Makefile.am 2010-12-29 20:50:14.038081700 -0600
2c3e6195
YS
3@@ -4,5 +4,5 @@ INCLUDES = -I$(top_srcdir)/common -I$(to
4 bin_PROGRAMS = dconf
5
6 dconf_VALAFLAGS = --vapidir ../client --pkg=gio-2.0 --pkg=posix --pkg=dconf
7-dconf_LDADD = $(gio_LIBS) ../client/libdconf.so.0
8+dconf_LDADD = $(gio_LIBS) ../client/libdconf.la
9 dconf_SOURCES = dconf.vala dconf-update.vala ../gvdb/gvdb-builder.c gvdb.vapi fixes.vapi
29f084c7
YS
10--- origsrc/dconf-0.6/client/Makefile.am 2010-12-21 11:25:23.000000000 -0600
11+++ src/dconf-0.6/client/Makefile.am 2010-12-29 20:50:14.038081700 -0600
12@@ -3,35 +3,24 @@ CFLAGS += -Wno-error
2c3e6195
YS
13 INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(gio_CFLAGS)
14
15 shlibdir=$(libdir)
16-shlib_PROGRAMS = libdconf.so.0.0.0
17-nodist_noinst_DATA = libdconf.so.0 libdconf.so
18-
19-libdconf.so.0 libdconf.so: libdconf.so.0.0.0
20- $(AM_V_GEN) ln -fs libdconf.so.0.0.0 $@
21-
22-install-data-hook:
23- ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.0
24- ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
25-
26-uninstall-hook:
27- rm -f $(DESTDIR)$(shlibdir)/libdconf.so.0
28- rm -f $(DESTDIR)$(shlibdir)/libdconf.so
29+lib_LTLIBRARIES = libdconf.la
30
31 dconfinclude_HEADERS = \
32 dconf-client.h \
33 dconf.h
34
35-libdconf_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.0 $(gio_LIBS)
36-libdconf_so_0_0_0_SOURCES = \
37+libdconf_la_LDFLAGS = -version-info 0:0:0 -no-undefined
38+libdconf_la_LIBADD = $(gio_LIBS)
39+libdconf_la_SOURCES = \
40 ../common/dconf-shmdir.c \
41 ../common/dconf-paths.c \
42 ../engine/dconf-engine.c \
43 ../gvdb/gvdb-reader.c \
44 dconf-client.vala engine.vapi
45-libdconf_so_0_0_0_VALAFLAGS = --library dconf --pkg=gio-2.0
46+libdconf_la_VALAFLAGS = --library dconf --pkg=gio-2.0
47
48 EXTRA_DIST = dconf.vapi extra-docs.c
49-dconf.vapi: libdconf.so.0
50+dconf.vapi: libdconf.la
51
52 dconf.deps:
53 $(AM_V_GEN) echo gio-2.0 > dconf.deps
29f084c7
YS
54--- /dev/null
55+++ src/dconf-0.6/client/libdconf_la_vala.stamp
56@@ -0,0 +1,1
57+timestamp
58--- origsrc/dconf-0.6/configure.ac 2010-12-21 11:33:48.000000000 -0600
59+++ src/dconf-0.6/configure.ac 2010-12-29 20:50:14.053681800 -0600
2c3e6195
YS
60@@ -12,6 +12,7 @@ AM_SILENT_RULES([yes])
61
62 # Check for programs
63 AC_PROG_CC
64+AC_PROG_LIBTOOL
65 AM_PROG_VALAC([0.9.5])
66
29f084c7
YS
67 # Gtk-doc support
68--- origsrc/dconf-0.6/editor/Makefile.am 2010-12-18 10:36:32.000000000 -0600
69+++ src/dconf-0.6/editor/Makefile.am 2010-12-29 20:51:29.261412900 -0600
70@@ -3,5 +3,5 @@ bin_PROGRAMS = dconf-editor
71 AM_CFLAGS = $(gtk_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client
72 AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg libxml-2.0 --pkg dconf
73 CFLAGS += -Wno-error
2c3e6195
YS
74-dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gee_LIBS) $(libxml_LIBS)
75+dconf_editor_LDADD = ../client/libdconf.la $(gtk_LIBS) $(gee_LIBS) $(libxml_LIBS)
76 dconf_editor_SOURCES = dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala
29f084c7
YS
77--- origsrc/dconf-0.6/gsettings/Makefile.am 2010-12-21 11:26:46.000000000 -0600
78+++ src/dconf-0.6/gsettings/Makefile.am 2010-12-29 20:50:14.069281800 -0600
2c3e6195
YS
79@@ -1,11 +1,11 @@
80 AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings -fPIC -DPIC
81 INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(gio_CFLAGS)
82
83-giomodules_PROGRAMS = libdconfsettings.so
84+giomodules_LTLIBRARIES = libdconfsettings.la
85
86-libdconfsettings_so_LDADD = $(gio_LIBS)
87-libdconfsettings_so_LDFLAGS = -module -avoid-version -shared
88-libdconfsettings_so_SOURCES = \
89+libdconfsettings_la_LIBADD = $(gio_LIBS)
90+libdconfsettings_la_LDFLAGS = -module -avoid-version -no-undefined
91+libdconfsettings_la_SOURCES = \
92 ../engine/dconf-engine.c \
93 ../common/dconf-shmdir.c \
94 ../gvdb/gvdb-reader.c \
This page took 0.02736 seconds and 5 git commands to generate.