]>
Commit | Line | Data |
---|---|---|
049ae3c1 | 1 | diff -Nur evolution-1.2.0.orig/camel/Makefile.am evolution-1.2.0.chng/camel/Makefile.am |
2 | --- evolution-1.2.0.orig/camel/Makefile.am Tue Sep 3 13:57:52 2002 | |
3 | +++ evolution-1.2.0.chng/camel/Makefile.am Thu Nov 14 14:20:52 2002 | |
4 | @@ -231,9 +231,10 @@ | |
5 | camel_lock_helper_SOURCES = \ | |
6 | camel-lock-helper.c \ | |
7 | camel-lock-helper.h \ | |
8 | - camel-lock.c \ | |
9 | camel-lock.h | |
10 | ||
11 | +camel_lock_helper_LDADD = camel-lock.o | |
12 | + | |
13 | camel_index_control_SOURCES = \ | |
14 | camel-index-control.c | |
15 | ||
16 | diff -Nur evolution-1.2.0.orig/doc/devel/Makefile.am evolution-1.2.0.chng/doc/devel/Makefile.am | |
17 | --- evolution-1.2.0.orig/doc/devel/Makefile.am Tue Jul 31 08:45:42 2001 | |
18 | +++ evolution-1.2.0.chng/doc/devel/Makefile.am Thu Nov 14 14:16:21 2002 | |
5a842923 | 19 | @@ -144,7 +144,7 @@ |
20 | fi) | |
21 | ||
22 | # echo '-- Installing $(srcdir)/html/index.sgml' ; \ | |
23 | -# $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ | |
24 | +# $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) | |
25 | ||
26 | # | |
27 | # Require gtk-doc when making dist | |
049ae3c1 | 28 | diff -Nur evolution-1.2.0.orig/my-evolution/Makefile.am evolution-1.2.0.chng/my-evolution/Makefile.am |
29 | --- evolution-1.2.0.orig/my-evolution/Makefile.am Fri Sep 13 16:53:20 2002 | |
30 | +++ evolution-1.2.0.chng/my-evolution/Makefile.am Thu Nov 14 20:35:57 2002 | |
31 | @@ -24,36 +24,41 @@ | |
32 | $(MAIL_GENERATED): $(IDLS) | |
33 | $(ORBIT_IDL) -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` $(top_srcdir)/mail/Mailer.idl | |
5a842923 | 34 | |
049ae3c1 | 35 | -summary_sources = \ |
36 | - $(MAIL_GENERATED) \ | |
37 | +summary_sources_c = \ | |
38 | + Mailer-common.c \ | |
39 | + Mailer-skels.c \ | |
40 | + Mailer-stubs.c \ | |
41 | component-factory.c \ | |
42 | - component-factory.h \ | |
43 | e-cell-tri.c \ | |
44 | - e-cell-tri.h \ | |
45 | e-summary.c \ | |
46 | - e-summary.h \ | |
47 | e-summary-calendar.c \ | |
48 | - e-summary-calendar.h \ | |
49 | e-summary-factory.c \ | |
50 | - e-summary-factory.h \ | |
51 | e-summary-mail.c \ | |
52 | - e-summary-mail.h \ | |
53 | e-summary-offline-handler.c \ | |
54 | - e-summary-offline-handler.h \ | |
55 | e-summary-preferences.c \ | |
56 | - e-summary-preferences.h \ | |
57 | e-summary-rdf.c \ | |
58 | - e-summary-rdf.h \ | |
59 | e-summary-shown.c \ | |
60 | - e-summary-shown.h \ | |
61 | e-summary-table.c \ | |
62 | - e-summary-table.h \ | |
63 | e-summary-tasks.c \ | |
64 | + e-summary-weather.c \ | |
65 | + metar.c | |
66 | + | |
67 | +summary_sources_h = \ | |
68 | + Mailer.h \ | |
69 | + component-factory.h \ | |
70 | + e-cell-tri.h \ | |
71 | + e-summary.h \ | |
72 | + e-summary-calendar.h \ | |
73 | + e-summary-factory.h \ | |
74 | + e-summary-mail.h \ | |
75 | + e-summary-offline-handler.h \ | |
76 | + e-summary-preferences.h \ | |
77 | + e-summary-rdf.h \ | |
78 | + e-summary-shown.h \ | |
79 | + e-summary-table.h \ | |
80 | e-summary-tasks.h \ | |
81 | e-summary-type.h \ | |
82 | - e-summary-weather.c \ | |
83 | e-summary-weather.h \ | |
84 | - metar.c \ | |
85 | metar.h \ | |
86 | my-evolution-html.h \ | |
87 | weather.h | |
88 | @@ -73,14 +78,22 @@ | |
89 | $(top_builddir)/libwombat/libwombat.la \ | |
90 | $(EVOLUTION_EXECUTIVE_SUMMARY_LIBS) | |
91 | ||
92 | +noinst_LIBRARIES = libevoltmp.a | |
93 | + | |
94 | +libevoltmp_a_SOURCES = \ | |
95 | + $(summary_sources_c) \ | |
96 | + $(summary_sources_h) | |
97 | + | |
98 | if ENABLE_SHLIB_COMPONENTS | |
99 | ||
100 | lib_LTLIBRARIES = libevolution-executive-summary.la | |
101 | ||
102 | libevolution_executive_summary_la_SOURCES = \ | |
103 | - $(summary_sources) | |
104 | + $(summary_sources_h) | |
105 | + | |
106 | ||
107 | -libevolution_executive_summary_la_LIBADD = \ | |
108 | +libevolution_executive_summary_la_LIBADD = \ | |
109 | + libevoltmp.a \ | |
110 | $(summary_libs) | |
111 | ||
112 | else | |
113 | @@ -88,10 +101,11 @@ | |
114 | bin_PROGRAMS = evolution-executive-summary | |
115 | ||
116 | evolution_executive_summary_SOURCES = \ | |
117 | - $(summary_sources) \ | |
118 | + $(summary_sources_h) \ | |
119 | $(summary_exe_sources) | |
120 | ||
121 | evolution_executive_summary_LDADD = \ | |
122 | + libevoltmp.a \ | |
123 | $(summary_libs) | |
124 | ||
125 | endif | |
126 | @@ -112,7 +126,8 @@ | |
127 | @XML_I18N_MERGE_OAF_RULE@ | |
128 | ||
129 | EXTRA_DIST = \ | |
130 | - $(summary_sources) \ | |
131 | + $(summary_sources_c) \ | |
132 | + $(summary_sources_h) \ | |
133 | $(summary_exe_sources) \ | |
134 | $(oaf_files) \ | |
135 | $(oaf_in_files) \ |