]> git.pld-linux.org Git - packages/evolution.git/blame - evolution-no-static-in-shared.patch
projects / packages / evolution.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- BR: which, gcc-g77
[packages/evolution.git] / evolution-no-static-in-shared.patch
CommitLineData
617addbd
JB		 1--- evolution-1.4.5/camel/Makefile.am.orig 2003-06-12 17:03:35.000000000 +0000
2+++ evolution-1.4.5/camel/Makefile.am 2003-11-23 13:18:40.000000000 +0000
3@@ -8,7 +8,6 @@
4 camellibexec_PROGRAMS = camel-lock-helper camel-index-control
5
6 privlib_LTLIBRARIES = libcamel.la
7-noinst_LTLIBRARIES = libcamel-static.la
8
9 INCLUDES = -I.. -I$(srcdir)/.. \
10 -I$(top_srcdir)/intl \
11@@ -229,10 +228,6 @@
12 $(top_builddir)/e-util/libeutil.la \
13 $(CAMEL_LIBS)
14
15-libcamel_static_la_SOURCES = $(libcamel_la_SOURCES)
16-libcamel_static_la_LIBADD = $(libcamel_la_LIBADD)
17-libcamel_static_la_LDFLAGS = --all-static
18-
19 camel_lock_helper_SOURCES = \
20 camel-lock-helper.c \
21 camel-lock-helper.h
22--- evolution-1.4.5/libwombat/Makefile.am.orig 2003-06-23 14:00:22.000000000 +0000
23+++ evolution-1.4.5/libwombat/Makefile.am 2003-11-23 13:20:45.000000000 +0000
24@@ -27,13 +27,6 @@
25 wombat-client.c \
26 $(wombatinclude_HEADERS)
27
28-# Static lib for pilot conduits
29-
30-noinst_LTLIBRARIES = libwombat-static.la
31-
32-libwombat_static_la_SOURCES = $(libwombat_la_SOURCES)
33-libwombat_static_la_LDFLAGS = --all-static
34-
35 BUILT_SOURCES = $(IDL_GENERATED)
36 CLEANFILES = $(BUILT_SOURCES)
37
38--- evolution-1.4.5/libical/src/libical/Makefile.am.orig 2003-02-10 15:53:20.000000000 +0000
39+++ evolution-1.4.5/libical/src/libical/Makefile.am 2003-11-23 13:21:43.000000000 +0000
40@@ -28,14 +28,6 @@
41
42 privlib_LTLIBRARIES = libical-evolution.la
43
44-noinst_LTLIBRARIES = libical-static.la
45-libical_static_la_SOURCES = $(libical_evolution_la_SOURCES)
46-libical_static_la_LDFLAGS = --all-static
47-
48-# Make sure libical-evolution.la and libical-static.la are not built in
49-# parallel when using a parallel make; libtool can't handle that.
50-libical_static_la_DEPENDENCIES = libical-evolution.la
51-
52 YFLAGS = -d -v -t -pical_yy
53 LFLAGS = -Pical_yy
54 LEX_OUTPUT_ROOT = lex.ical_yy
55--- evolution-1.4.5/e-util/ename/Makefile.am.orig 2003-02-06 21:59:58.000000000 +0000
56+++ evolution-1.4.5/e-util/ename/Makefile.am 2003-11-23 13:23:09.000000000 +0000
57@@ -26,11 +26,6 @@
58 e-name-western.h
59
60
61-noinst_LTLIBRARIES = libename-static.la
62-libename_static_la_SOURCES = $(libename_la_SOURCES)
63-libename_static_la_LDFLAGS = --all-static
64-
65-
66 noinst_PROGRAMS = \
67 test-ename-western \
68 test-ename-western-gtk
69--- evolution-1.4.5/e-util/Makefile.am.orig 2003-09-11 16:19:50.000000000 +0000
70+++ evolution-1.4.5/e-util/Makefile.am 2003-11-23 13:23:41.000000000 +0000
71@@ -16,7 +16,6 @@
72 $(E_UTIL_CFLAGS)
73
74 privlib_LTLIBRARIES = libeutil.la libedb3util.la libeconduit.la
75-noinst_LTLIBRARIES = libeutil-static.la
76
77 eutilinclude_HEADERS = \
78 e-account-list.h \
79@@ -107,13 +106,6 @@
80
81 libeutil_la_LIBADD = $(E_UTIL_LIBS)
82
83-libeutil_static_la_SOURCES = $(libeutil_la_SOURCES)
84-libeutil_static_la_LIBADD = $(libeutil_la_LIBADD)
85-libeutil_static_la_LDFLAGS = -all-static
86-# Make sure libeutil.la and libeutil-static.la are not built in
87-# parallel when using a parallel make; libtool can't handle that.
88-libeutil_static_la_DEPENDENCIES = libeutil.la
89-
90 econdinclude_HEADERS = \
91 e-pilot-map.h \
92 e-pilot-settings.h \
93--- evolution-1.4.5/calendar/cal-util/Makefile.am.orig 2003-02-24 14:33:38.000000000 +0000
94+++ evolution-1.4.5/calendar/cal-util/Makefile.am 2003-11-23 13:24:15.000000000 +0000
95@@ -15,7 +15,7 @@
96 # cal util library
97 #
98
99-privlib_LTLIBRARIES = libcal-util-static.la libcal-util.la
100+privlib_LTLIBRARIES = libcal-util.la
101
102 libcal_util_la_SOURCES = \
103 cal-util-marshal.c \
104@@ -52,13 +52,6 @@
105
106 BUILT_SOURCES = $(MARSHAL_GENERATED)
107
108-#
109-# static library for use in conduits' shared libraries
110-#
111-#lib_LTLIBRARIES = libcal-util-static.la
112-libcal_util_static_la_SOURCES = $(libcal_util_la_SOURCES)
113-libcal_util_static_la_LDFLAGS = -all-static
114-
115 test_recur_SOURCES = \
116 test-recur.c
117
118@@ -67,4 +60,4 @@
119 $(EVOLUTION_CALENDAR_LIBS)
120
121 EXTRA_DIST = \
122- cal-util-marshal.list
123\ No newline at end of file
124+ cal-util-marshal.list
125--- evolution-1.4.5/calendar/conduits/todo/Makefile.am.orig 2003-09-11 16:19:06.000000000 +0000
126+++ evolution-1.4.5/calendar/conduits/todo/Makefile.am 2003-11-23 13:27:00.000000000 +0000
127@@ -18,11 +18,11 @@
128 libetodo_conduit_la_LDFLAGS = -module -avoid-version
129 libetodo_conduit_la_LIBADD = \
130 $(top_builddir)/e-util/libeutil.la \
131- $(top_builddir)/calendar/cal-client/libcal-client-static.la \
132- $(top_builddir)/calendar/cal-util/libcal-util-static.la \
133+ $(top_builddir)/calendar/cal-client/libcal-client.la \
134+ $(top_builddir)/calendar/cal-util/libcal-util.la \
135 $(top_builddir)/libversit/libversit.la \
136- $(top_builddir)/libical/src/libical/libical-static.la \
137- $(top_builddir)/libwombat/libwombat-static.la \
138+ $(top_builddir)/libical/src/libical/libical-evolution.la \
139+ $(top_builddir)/libwombat/libwombat.la \
140 $(top_builddir)/e-util/libeconduit.la \
141 $(EVOLUTION_CALENDAR_CONDUIT_LIBS)
142
143--- evolution-1.4.5/calendar/conduits/calendar/Makefile.am.orig 2003-06-23 13:59:48.000000000 +0000
144+++ evolution-1.4.5/calendar/conduits/calendar/Makefile.am 2003-11-23 13:28:24.000000000 +0000
145@@ -18,11 +18,11 @@
146 libecalendar_conduit_la_LDFLAGS = -module -avoid-version
147 libecalendar_conduit_la_LIBADD = \
148 $(top_builddir)/e-util/libeutil.la \
149- $(top_builddir)/calendar/cal-client/libcal-client-static.la \
150- $(top_builddir)/calendar/cal-util/libcal-util-static.la \
151+ $(top_builddir)/calendar/cal-client/libcal-client.la \
152+ $(top_builddir)/calendar/cal-util/libcal-util.la \
153 $(top_builddir)/libversit/libversit.la \
154- $(top_builddir)/libical/src/libical/libical-static.la \
155- $(top_builddir)/libwombat/libwombat-static.la \
156+ $(top_builddir)/libical/src/libical/libical-evolution.la \
157+ $(top_builddir)/libwombat/libwombat.la \
158 $(top_builddir)/e-util/libeconduit.la \
159 $(EVOLUTION_CALENDAR_CONDUIT_LIBS)
160
161--- evolution-1.4.5/calendar/cal-client/Makefile.am.orig 2003-02-24 14:33:38.000000000 +0000
162+++ evolution-1.4.5/calendar/cal-client/Makefile.am 2003-11-23 13:24:59.000000000 +0000
163@@ -62,14 +62,6 @@
164 cal-query.h
165
166 #
167-# make a static library for use by calendar conduit's shared library
168-#
169-noinst_LTLIBRARIES = libcal-client-static.la
170-libcal_client_static_la_SOURCES = $(libcal_client_la_SOURCES)
171-libcal_client_static_la_LDFLAGS = --all-static
172-
173-
174-#
175 # client-test program
176 #
177
178--- evolution-1.4.5/addressbook/conduit/Makefile.am.orig 2003-09-11 16:18:55.000000000 +0000
179+++ evolution-1.4.5/addressbook/conduit/Makefile.am 2003-11-23 13:29:00.000000000 +0000
180@@ -18,8 +18,8 @@
181 libeaddress_conduit_la_LDFLAGS = -module -avoid-version
182 libeaddress_conduit_la_LIBADD = \
183 $(top_builddir)/e-util/libeutil.la \
184- $(top_builddir)/addressbook/backend/ebook/libebook-static.la \
185- $(top_builddir)/e-util/ename/libename-static.la \
186+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
187+ $(top_builddir)/e-util/ename/libename.la \
188 $(top_builddir)/libversit/libversit.la \
189 $(top_builddir)/e-util/libeconduit.la \
190 $(top_builddir)/camel/libcamel.la \
191--- evolution-1.4.5/addressbook/backend/ebook/Makefile.am.orig 2003-06-12 17:02:46.000000000 +0000
192+++ evolution-1.4.5/addressbook/backend/ebook/Makefile.am 2003-11-23 13:25:34.000000000 +0000
193@@ -49,11 +49,7 @@
194 -DLIBGNOME_DISABLE_DEPRECATED \
195 $(EVOLUTION_ADDRESSBOOK_CFLAGS)
196
197-privlib_LTLIBRARIES = libebook.la libebook-static.la
198-
199-# Make sure the libraries are not built in parallel when using a parallel make;
200-# libtool can't handle that.
201-libebook_static_la_DEPENDENCIES = libebook.la
202+privlib_LTLIBRARIES = libebook.la
203
204 libebook_la_SOURCES = \
205 $(CORBA_SOURCE) \
206@@ -93,12 +89,6 @@
207 addressbook.h
208
209
210-#
211-# make a static library for use by addressbook's conduit's shared library
212-#
213-libebook_static_la_SOURCES = $(libebook_la_SOURCES)
214-libebook_static_la_LDFLAGS = -all-static
215-
216 # GLib marshalling cruft
217
218 e-book-marshal.h: e-book-marshal.list
The GNOME Email/Calendar/Addressbook Suite
This page took 0.149897 seconds and 4 git commands to generate.