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

propagate from branch 'im.pidgin.pidgin' (head 32c5c2d4cfb2bede5ffb66792760a368ba8b9f0a) to branch 'im.pidgin.soc.2009.webkitmessageview' (head 92ef7ff2d3d0706e73113ff78aded4c9ce5559e4)

--- a/pidgin/plugins/Makefile.am	Tue Aug 25 16:38:18 2009 +0000
+++ b/pidgin/plugins/Makefile.am	Tue Aug 25 17:01:49 2009 +0000
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = cap disco gestures gevolution musicmessaging perl ticker
+DIST_SUBDIRS = adiumthemes cap disco gestures gevolution musicmessaging perl ticker
 
 if BUILD_GEVOLUTION
 GEVOLUTION_DIR = gevolution
@@ -16,9 +16,6 @@
 PERL_DIR = perl
 endif
 
-if ENABLE_GESTURES
-GESTURE_DIR = gestures
-endif
 
 SUBDIRS = \
 	$(CAP_DIR) \
@@ -27,7 +24,8 @@
 	$(MUSICMESSAGING_DIR) \
 	$(PERL_DIR) \
 	disco \
-	ticker
+	ticker \
+	adiumthemes
 
 plugindir = $(libdir)/pidgin
 
@@ -36,17 +34,12 @@
 extplacement_la_LDFLAGS     = -module -avoid-version
 gtk_signals_test_la_LDFLAGS = -module -avoid-version
 gtkbuddynote_la_LDFLAGS     = -module -avoid-version
-history_la_LDFLAGS          = -module -avoid-version
 iconaway_la_LDFLAGS         = -module -avoid-version
-markerline_la_LDFLAGS       = -module -avoid-version
-notify_la_LDFLAGS           = -module -avoid-version
 pidginrc_la_LDFLAGS         = -module -avoid-version
 relnot_la_LDFLAGS           = -module -avoid-version
 sendbutton_la_LDFLAGS       = -module -avoid-version
 spellchk_la_LDFLAGS         = -module -avoid-version
 themeedit_la_LDFLAGS        = -module -avoid-version
-timestamp_la_LDFLAGS        = -module -avoid-version
-timestamp_format_la_LDFLAGS = -module -avoid-version
 vvconfig_la_LDFLAGS         = -module -avoid-version
 xmppconsole_la_LDFLAGS      = -module -avoid-version
 
@@ -56,17 +49,12 @@
 	convcolors.la       \
 	extplacement.la     \
 	gtkbuddynote.la     \
-	history.la          \
 	iconaway.la         \
-	markerline.la       \
-	notify.la           \
 	pidginrc.la         \
 	relnot.la           \
 	sendbutton.la       \
 	spellchk.la         \
 	themeedit.la         \
-	timestamp.la        \
-	timestamp_format.la \
 	xmppconsole.la
 
 if USE_VV
@@ -82,15 +70,13 @@
 extplacement_la_SOURCES     = extplacement.c
 gtk_signals_test_la_SOURCES = gtk-signals-test.c
 gtkbuddynote_la_SOURCES     = gtkbuddynote.c
-history_la_SOURCES          = history.c
 iconaway_la_SOURCES         = iconaway.c
-markerline_la_SOURCES       = markerline.c
-notify_la_SOURCES           = notify.c
 pidginrc_la_SOURCES         = pidginrc.c
 relnot_la_SOURCES           = relnot.c
 sendbutton_la_SOURCES       = sendbutton.c
 spellchk_la_SOURCES         = spellchk.c
 themeedit_la_SOURCES        = themeedit.c themeedit-icon.c themeedit-icon.h
+<<<<<<< variant A
 timestamp_la_SOURCES        = timestamp.c
 timestamp_format_la_SOURCES = timestamp_format.c
 vvconfig_SOURCES            = vvconfig.c
@@ -113,6 +99,29 @@
 timestamp_la_LIBADD         = $(GTK_LIBS)
 timestamp_format_la_LIBADD  = $(GTK_LIBS)
 vvconfig_la_LIBADD          = $(GTK_LIBS) $(GSTREAMER_LIBS)
+>>>>>>> variant B
+####### Ancestor
+timestamp_la_SOURCES        = timestamp.c
+timestamp_format_la_SOURCES = timestamp_format.c
+xmppconsole_la_SOURCES      = xmppconsole.c
+
+convcolors_la_LIBADD        = $(GTK_LIBS)
+contact_priority_la_LIBADD  = $(GTK_LIBS)
+extplacement_la_LIBADD      = $(GTK_LIBS)
+gtk_signals_test_la_LIBADD  = $(GTK_LIBS)
+gtkbuddynote_la_LIBADD      = $(GTK_LIBS)
+history_la_LIBADD           = $(GTK_LIBS)
+iconaway_la_LIBADD          = $(GTK_LIBS)
+markerline_la_LIBADD        = $(GTK_LIBS)
+notify_la_LIBADD            = $(GTK_LIBS)
+pidginrc_la_LIBADD          = $(GTK_LIBS)
+relnot_la_LIBADD            = $(GLIB_LIBS)
+sendbutton_la_LIBADD        = $(GTK_LIBS)
+spellchk_la_LIBADD          = $(GTK_LIBS)
+themeedit_la_LIBADD         = $(GTK_LIBS)
+timestamp_la_LIBADD         = $(GTK_LIBS)
+timestamp_format_la_LIBADD  = $(GTK_LIBS)
+======= end
 xmppconsole_la_LIBADD       = $(GTK_LIBS)
 
 endif # PLUGINS