Mercurial > pidgin

comparison pidgin/plugins/Makefile.am @ 32112:1ca2df744414

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 32c5c2d4cfb2bede5ffb66792760a368ba8b9f0a) to branch 'im.pidgin.soc.2009.webkitmessageview' (head 92ef7ff2d3d0706e73113ff78aded4c9ce5559e4)
author tdrhq@soc.pidgin.im
date Tue, 25 Aug 2009 17:01:49 +0000
parents b9e28b2a119b fe75cd926073
children 4b53d875529f
comparison
equal deleted inserted replaced
28096:b357216b7b79 32112:1ca2df744414
1 DIST_SUBDIRS = cap disco gestures gevolution musicmessaging perl ticker 1 DIST_SUBDIRS = adiumthemes cap disco gestures gevolution musicmessaging perl ticker
2 2
3 if BUILD_GEVOLUTION 3 if BUILD_GEVOLUTION
4 GEVOLUTION_DIR = gevolution 4 GEVOLUTION_DIR = gevolution
5 endif 5 endif
6 6
14 14
15 if USE_PERL 15 if USE_PERL
16 PERL_DIR = perl 16 PERL_DIR = perl
17 endif 17 endif
18 18
19 if ENABLE_GESTURES
20 GESTURE_DIR = gestures
21 endif
22 19
23 SUBDIRS = \ 20 SUBDIRS = \
24 $(CAP_DIR) \ 21 $(CAP_DIR) \
25 $(GESTURE_DIR) \ 22 $(GESTURE_DIR) \
26 $(GEVOLUTION_DIR) \ 23 $(GEVOLUTION_DIR) \
27 $(MUSICMESSAGING_DIR) \ 24 $(MUSICMESSAGING_DIR) \
28 $(PERL_DIR) \ 25 $(PERL_DIR) \
29 disco \ 26 disco \
30 ticker 27 ticker \
28 adiumthemes
31 29
32 plugindir = $(libdir)/pidgin 30 plugindir = $(libdir)/pidgin
33 31
34 convcolors_la_LDFLAGS = -module -avoid-version 32 convcolors_la_LDFLAGS = -module -avoid-version
35 contact_priority_la_LDFLAGS = -module -avoid-version 33 contact_priority_la_LDFLAGS = -module -avoid-version
36 extplacement_la_LDFLAGS = -module -avoid-version 34 extplacement_la_LDFLAGS = -module -avoid-version
37 gtk_signals_test_la_LDFLAGS = -module -avoid-version 35 gtk_signals_test_la_LDFLAGS = -module -avoid-version
38 gtkbuddynote_la_LDFLAGS = -module -avoid-version 36 gtkbuddynote_la_LDFLAGS = -module -avoid-version
39 history_la_LDFLAGS = -module -avoid-version
40 iconaway_la_LDFLAGS = -module -avoid-version 37 iconaway_la_LDFLAGS = -module -avoid-version
41 markerline_la_LDFLAGS = -module -avoid-version
42 notify_la_LDFLAGS = -module -avoid-version
43 pidginrc_la_LDFLAGS = -module -avoid-version 38 pidginrc_la_LDFLAGS = -module -avoid-version
44 relnot_la_LDFLAGS = -module -avoid-version 39 relnot_la_LDFLAGS = -module -avoid-version
45 sendbutton_la_LDFLAGS = -module -avoid-version 40 sendbutton_la_LDFLAGS = -module -avoid-version
46 spellchk_la_LDFLAGS = -module -avoid-version 41 spellchk_la_LDFLAGS = -module -avoid-version
47 themeedit_la_LDFLAGS = -module -avoid-version 42 themeedit_la_LDFLAGS = -module -avoid-version
48 timestamp_la_LDFLAGS = -module -avoid-version
49 timestamp_format_la_LDFLAGS = -module -avoid-version
50 vvconfig_la_LDFLAGS = -module -avoid-version 43 vvconfig_la_LDFLAGS = -module -avoid-version
51 xmppconsole_la_LDFLAGS = -module -avoid-version 44 xmppconsole_la_LDFLAGS = -module -avoid-version
52 45
53 if PLUGINS 46 if PLUGINS
54 47
55 plugin_LTLIBRARIES = \ 48 plugin_LTLIBRARIES = \
56 convcolors.la \ 49 convcolors.la \
57 extplacement.la \ 50 extplacement.la \
58 gtkbuddynote.la \ 51 gtkbuddynote.la \
59 history.la \
60 iconaway.la \ 52 iconaway.la \
61 markerline.la \
62 notify.la \
63 pidginrc.la \ 53 pidginrc.la \
64 relnot.la \ 54 relnot.la \
65 sendbutton.la \ 55 sendbutton.la \
66 spellchk.la \ 56 spellchk.la \
67 themeedit.la \ 57 themeedit.la \
68 timestamp.la \
69 timestamp_format.la \
70 xmppconsole.la 58 xmppconsole.la
71 59
72 if USE_VV 60 if USE_VV
73 plugin_LTLIBRARIES += vvconfig.la 61 plugin_LTLIBRARIES += vvconfig.la
74 endif 62 endif
80 convcolors_la_SOURCES = convcolors.c 68 convcolors_la_SOURCES = convcolors.c
81 contact_priority_la_SOURCES = contact_priority.c 69 contact_priority_la_SOURCES = contact_priority.c
82 extplacement_la_SOURCES = extplacement.c 70 extplacement_la_SOURCES = extplacement.c
83 gtk_signals_test_la_SOURCES = gtk-signals-test.c 71 gtk_signals_test_la_SOURCES = gtk-signals-test.c
84 gtkbuddynote_la_SOURCES = gtkbuddynote.c 72 gtkbuddynote_la_SOURCES = gtkbuddynote.c
85 history_la_SOURCES = history.c
86 iconaway_la_SOURCES = iconaway.c 73 iconaway_la_SOURCES = iconaway.c
87 markerline_la_SOURCES = markerline.c
88 notify_la_SOURCES = notify.c
89 pidginrc_la_SOURCES = pidginrc.c 74 pidginrc_la_SOURCES = pidginrc.c
90 relnot_la_SOURCES = relnot.c 75 relnot_la_SOURCES = relnot.c
91 sendbutton_la_SOURCES = sendbutton.c 76 sendbutton_la_SOURCES = sendbutton.c
92 spellchk_la_SOURCES = spellchk.c 77 spellchk_la_SOURCES = spellchk.c
93 themeedit_la_SOURCES = themeedit.c themeedit-icon.c themeedit-icon.h 78 themeedit_la_SOURCES = themeedit.c themeedit-icon.c themeedit-icon.h
79 <<<<<<< variant A
94 timestamp_la_SOURCES = timestamp.c 80 timestamp_la_SOURCES = timestamp.c
95 timestamp_format_la_SOURCES = timestamp_format.c 81 timestamp_format_la_SOURCES = timestamp_format.c
96 vvconfig_SOURCES = vvconfig.c 82 vvconfig_SOURCES = vvconfig.c
97 xmppconsole_la_SOURCES = xmppconsole.c 83 xmppconsole_la_SOURCES = xmppconsole.c
98 84
111 spellchk_la_LIBADD = $(GTK_LIBS) 97 spellchk_la_LIBADD = $(GTK_LIBS)
112 themeedit_la_LIBADD = $(GTK_LIBS) 98 themeedit_la_LIBADD = $(GTK_LIBS)
113 timestamp_la_LIBADD = $(GTK_LIBS) 99 timestamp_la_LIBADD = $(GTK_LIBS)
114 timestamp_format_la_LIBADD = $(GTK_LIBS) 100 timestamp_format_la_LIBADD = $(GTK_LIBS)
115 vvconfig_la_LIBADD = $(GTK_LIBS) $(GSTREAMER_LIBS) 101 vvconfig_la_LIBADD = $(GTK_LIBS) $(GSTREAMER_LIBS)
102 >>>>>>> variant B
103 ####### Ancestor
104 timestamp_la_SOURCES = timestamp.c
105 timestamp_format_la_SOURCES = timestamp_format.c
106 xmppconsole_la_SOURCES = xmppconsole.c
107
108 convcolors_la_LIBADD = $(GTK_LIBS)
109 contact_priority_la_LIBADD = $(GTK_LIBS)
110 extplacement_la_LIBADD = $(GTK_LIBS)
111 gtk_signals_test_la_LIBADD = $(GTK_LIBS)
112 gtkbuddynote_la_LIBADD = $(GTK_LIBS)
113 history_la_LIBADD = $(GTK_LIBS)
114 iconaway_la_LIBADD = $(GTK_LIBS)
115 markerline_la_LIBADD = $(GTK_LIBS)
116 notify_la_LIBADD = $(GTK_LIBS)
117 pidginrc_la_LIBADD = $(GTK_LIBS)
118 relnot_la_LIBADD = $(GLIB_LIBS)
119 sendbutton_la_LIBADD = $(GTK_LIBS)
120 spellchk_la_LIBADD = $(GTK_LIBS)
121 themeedit_la_LIBADD = $(GTK_LIBS)
122 timestamp_la_LIBADD = $(GTK_LIBS)
123 timestamp_format_la_LIBADD = $(GTK_LIBS)
124 ======= end
116 xmppconsole_la_LIBADD = $(GTK_LIBS) 125 xmppconsole_la_LIBADD = $(GTK_LIBS)
117 126
118 endif # PLUGINS 127 endif # PLUGINS
119 128
120 EXTRA_DIST = \ 129 EXTRA_DIST = \