summaryrefslogtreecommitdiff
path: root/net-im/gaim/files/patch-ac
blob: 2d29a772142ffd2995951b0da7fe9ffb049848f5 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
--- src/Makefile.in.orig	Fri Dec 14 22:38:10 2001
+++ src/Makefile.in	Fri Dec 14 22:46:20 2001
@@ -155,74 +155,74 @@
 
 SUBDIRS = protocols
 
-@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet
+@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet gaim
 @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim
-@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c \
-@GNOMEAPPLET_TRUE@			aim.c \
-@GNOMEAPPLET_TRUE@			applet.c \
-@GNOMEAPPLET_TRUE@			away.c \
-@GNOMEAPPLET_TRUE@			browser.c \
-@GNOMEAPPLET_TRUE@			buddy.c \
-@GNOMEAPPLET_TRUE@			buddy_chat.c \
-@GNOMEAPPLET_TRUE@			conversation.c \
-@GNOMEAPPLET_TRUE@			core.c \
-@GNOMEAPPLET_TRUE@			dialogs.c \
-@GNOMEAPPLET_TRUE@			gaimrc.c \
-@GNOMEAPPLET_TRUE@			gtkimhtml.c \
-@GNOMEAPPLET_TRUE@			gtkspell.c \
-@GNOMEAPPLET_TRUE@			gtkticker.c \
-@GNOMEAPPLET_TRUE@			html.c \
-@GNOMEAPPLET_TRUE@			idle.c \
-@GNOMEAPPLET_TRUE@			list.c \
-@GNOMEAPPLET_TRUE@			md5.c \
-@GNOMEAPPLET_TRUE@			module.c \
-@GNOMEAPPLET_TRUE@			multi.c \
-@GNOMEAPPLET_TRUE@			perl.c \
-@GNOMEAPPLET_TRUE@			plugins.c \
-@GNOMEAPPLET_TRUE@			prefs.c \
-@GNOMEAPPLET_TRUE@			proxy.c \
-@GNOMEAPPLET_TRUE@			prpl.c \
-@GNOMEAPPLET_TRUE@			server.c \
-@GNOMEAPPLET_TRUE@			sound.c \
-@GNOMEAPPLET_TRUE@			ticker.c \
-@GNOMEAPPLET_TRUE@			util.c
-
-@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
-@GNOMEAPPLET_TRUE@gaim_applet_LDFLAGS = -export-dynamic
-@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @LDADD@ @LIBOBJS@
-@GNOMEAPPLET_FALSE@gaim_SOURCES = about.c \
-@GNOMEAPPLET_FALSE@		aim.c \
-@GNOMEAPPLET_FALSE@		applet.c \
-@GNOMEAPPLET_FALSE@		away.c \
-@GNOMEAPPLET_FALSE@		browser.c \
-@GNOMEAPPLET_FALSE@		buddy.c \
-@GNOMEAPPLET_FALSE@		buddy_chat.c \
-@GNOMEAPPLET_FALSE@		conversation.c \
-@GNOMEAPPLET_FALSE@		core.c \
-@GNOMEAPPLET_FALSE@		dialogs.c \
-@GNOMEAPPLET_FALSE@		gaimrc.c \
-@GNOMEAPPLET_FALSE@		gtkimhtml.c \
-@GNOMEAPPLET_FALSE@		gtkspell.c \
-@GNOMEAPPLET_FALSE@		gtkticker.c \
-@GNOMEAPPLET_FALSE@		html.c \
-@GNOMEAPPLET_FALSE@		idle.c \
-@GNOMEAPPLET_FALSE@		list.c \
-@GNOMEAPPLET_FALSE@		md5.c \
-@GNOMEAPPLET_FALSE@		module.c \
-@GNOMEAPPLET_FALSE@		multi.c \
-@GNOMEAPPLET_FALSE@		perl.c \
-@GNOMEAPPLET_FALSE@		plugins.c \
-@GNOMEAPPLET_FALSE@		prefs.c \
-@GNOMEAPPLET_FALSE@		proxy.c \
-@GNOMEAPPLET_FALSE@		prpl.c \
-@GNOMEAPPLET_FALSE@		server.c \
-@GNOMEAPPLET_FALSE@		sound.c \
-@GNOMEAPPLET_FALSE@		ticker.c \
-@GNOMEAPPLET_FALSE@		util.c
-
-@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
-@GNOMEAPPLET_FALSE@gaim_LDFLAGS = -export-dynamic
-@GNOMEAPPLET_FALSE@gaim_LDADD = @LDADD@ @LIBOBJS@
+gaim_applet_SOURCES = about.c \
+			aim.c \
+			applet.c \
+			away.c \
+			browser.c \
+			buddy.c \
+			buddy_chat.c \
+			conversation.c \
+			core.c \
+			dialogs.c \
+			gaimrc.c \
+			gtkimhtml.c \
+			gtkspell.c \
+			gtkticker.c \
+			html.c \
+			idle.c \
+			list.c \
+			md5.c \
+			module.c \
+			multi.c \
+			perl.c \
+			plugins.c \
+			prefs.c \
+			proxy.c \
+			prpl.c \
+			server.c \
+			sound.c \
+			ticker.c \
+			util.c
+
+gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
+gaim_applet_LDFLAGS = -export-dynamic
+gaim_applet_LDADD = @LDADD@ @LIBOBJS@
+gaim_SOURCES = about.c \
+		aim.c \
+		applet.c \
+		away.c \
+		browser.c \
+		buddy.c \
+		buddy_chat.c \
+		conversation.c \
+		core.c \
+		dialogs.c \
+		gaimrc.c \
+		gtkimhtml.c \
+		gtkspell.c \
+		gtkticker.c \
+		html.c \
+		idle.c \
+		list.c \
+		md5.c \
+		module.c \
+		multi.c \
+		perl.c \
+		plugins.c \
+		prefs.c \
+		proxy.c \
+		prpl.c \
+		server.c \
+		sound.c \
+		ticker.c \
+		util.c
+
+gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
+gaim_LDFLAGS = -export-dynamic
+gaim_LDADD = @LDADD@ @LIBOBJS@
 
 EXTRA_DIST = applet.h \
 		convo.h \
@@ -244,44 +244,41 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet$(EXEEXT)
+@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet$(EXEEXT) gaim$(EXEEXT)
 @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-@GNOMEAPPLET_TRUE@am_gaim_OBJECTS =
-@GNOMEAPPLET_FALSE@am_gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
-@GNOMEAPPLET_FALSE@	applet.$(OBJEXT) away.$(OBJEXT) \
-@GNOMEAPPLET_FALSE@	browser.$(OBJEXT) buddy.$(OBJEXT) \
-@GNOMEAPPLET_FALSE@	buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \
-@GNOMEAPPLET_FALSE@	core.$(OBJEXT) dialogs.$(OBJEXT) \
-@GNOMEAPPLET_FALSE@	gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \
-@GNOMEAPPLET_FALSE@	gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \
-@GNOMEAPPLET_FALSE@	html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \
-@GNOMEAPPLET_FALSE@	md5.$(OBJEXT) module.$(OBJEXT) \
-@GNOMEAPPLET_FALSE@	multi.$(OBJEXT) perl.$(OBJEXT) \
-@GNOMEAPPLET_FALSE@	plugins.$(OBJEXT) prefs.$(OBJEXT) \
-@GNOMEAPPLET_FALSE@	proxy.$(OBJEXT) prpl.$(OBJEXT) \
-@GNOMEAPPLET_FALSE@	server.$(OBJEXT) sound.$(OBJEXT) \
-@GNOMEAPPLET_FALSE@	ticker.$(OBJEXT) util.$(OBJEXT)
+am_gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
+	applet.$(OBJEXT) away.$(OBJEXT) \
+	browser.$(OBJEXT) buddy.$(OBJEXT) \
+	buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \
+	core.$(OBJEXT) dialogs.$(OBJEXT) \
+	gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \
+	gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \
+	html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \
+	md5.$(OBJEXT) module.$(OBJEXT) \
+	multi.$(OBJEXT) perl.$(OBJEXT) \
+	plugins.$(OBJEXT) prefs.$(OBJEXT) \
+	proxy.$(OBJEXT) prpl.$(OBJEXT) \
+	server.$(OBJEXT) sound.$(OBJEXT) \
+	ticker.$(OBJEXT) util.$(OBJEXT)
 gaim_OBJECTS = $(am_gaim_OBJECTS)
-@GNOMEAPPLET_TRUE@gaim_DEPENDENCIES =
-@GNOMEAPPLET_TRUE@am_gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
-@GNOMEAPPLET_TRUE@	applet.$(OBJEXT) away.$(OBJEXT) \
-@GNOMEAPPLET_TRUE@	browser.$(OBJEXT) buddy.$(OBJEXT) \
-@GNOMEAPPLET_TRUE@	buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \
-@GNOMEAPPLET_TRUE@	core.$(OBJEXT) dialogs.$(OBJEXT) \
-@GNOMEAPPLET_TRUE@	gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \
-@GNOMEAPPLET_TRUE@	gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \
-@GNOMEAPPLET_TRUE@	html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \
-@GNOMEAPPLET_TRUE@	md5.$(OBJEXT) module.$(OBJEXT) \
-@GNOMEAPPLET_TRUE@	multi.$(OBJEXT) perl.$(OBJEXT) \
-@GNOMEAPPLET_TRUE@	plugins.$(OBJEXT) prefs.$(OBJEXT) \
-@GNOMEAPPLET_TRUE@	proxy.$(OBJEXT) prpl.$(OBJEXT) \
-@GNOMEAPPLET_TRUE@	server.$(OBJEXT) sound.$(OBJEXT) \
-@GNOMEAPPLET_TRUE@	ticker.$(OBJEXT) util.$(OBJEXT)
-@GNOMEAPPLET_FALSE@am_gaim_applet_OBJECTS =
+am_gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
+	applet.$(OBJEXT) away.$(OBJEXT) \
+	browser.$(OBJEXT) buddy.$(OBJEXT) \
+	buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \
+	core.$(OBJEXT) dialogs.$(OBJEXT) \
+	gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \
+	gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \
+	html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \
+	md5.$(OBJEXT) module.$(OBJEXT) \
+	multi.$(OBJEXT) perl.$(OBJEXT) \
+	plugins.$(OBJEXT) prefs.$(OBJEXT) \
+	proxy.$(OBJEXT) prpl.$(OBJEXT) \
+	server.$(OBJEXT) sound.$(OBJEXT) \
+	ticker.$(OBJEXT) util.$(OBJEXT)
+
 gaim_applet_OBJECTS = $(am_gaim_applet_OBJECTS)
-@GNOMEAPPLET_FALSE@gaim_applet_DEPENDENCIES =
 
 DEFS = @DEFS@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)