# HG changeset patch
# User Gary Kramlich <grim@reaperworld.com>
# Date 1125799428 0
# Node ID 1a2eaba2bc13c7fce0167a2f40ab7270eda76391
# Parent  f191b5bc199b046c6acc55b228bcfbc893c2b4f2
[gaim-migrate @ 13672]
Some autotools tweak from Kevin Stange to let autogen.sh pass with automake 1.9

committer: Tailor Script <tailor@pidgin.im>

diff -r f191b5bc199b -r 1a2eaba2bc13 plugins/Makefile.am
--- a/plugins/Makefile.am	Sat Sep 03 15:01:56 2005 +0000
+++ b/plugins/Makefile.am	Sun Sep 04 02:03:48 2005 +0000
@@ -12,9 +12,17 @@
 TCL_DIR = tcl
 endif
 
+if ENABLE_DBUS
+DBUS_LTLIB = dbus-example.la
+
+# Only use music messaging if dbus is enabled
+MUSICMESSAGING_DIR = musicmessaging
+endif
+
 SUBDIRS = \
 	docklet $(GEVOLUTION_DIR) gestures \
-	$(PERL_DIR) ssl $(TCL_DIR) ticker
+	$(PERL_DIR) ssl $(TCL_DIR) ticker \
+	$(MUSICMESSAGING_DIR)
 
 plugindir = $(libdir)/gaim
 
@@ -43,7 +51,8 @@
 	relnot.la        \
 	spellchk.la      \
 	statenotify.la   \
-	timestamp.la
+	timestamp.la     \
+	$(DBUS_LTLIB)
 
 autorecon_la_SOURCES    = autorecon.c
 
@@ -60,13 +69,9 @@
 
 if ENABLE_DBUS
 
-# Only use music messaging if dbus is enabled
-SUBDIRS += musicmessaging
-
 CLEANFILES              = dbus-example-bindings.c
 dbus_example_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS) $(DBUS_LIBS)
 dbus_example_la_SOURCES = dbus-example.c
-plugin_LTLIBRARIES     += dbus-example.la
 
 .PHONY: always
 
diff -r f191b5bc199b -r 1a2eaba2bc13 plugins/musicmessaging/Makefile.am
--- a/plugins/musicmessaging/Makefile.am	Sat Sep 03 15:01:56 2005 +0000
+++ b/plugins/musicmessaging/Makefile.am	Sun Sep 04 02:03:48 2005 +0000
@@ -3,7 +3,7 @@
 
 plugindir = $(libdir)/gaim
 
-musicmessaging_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
+musicmessaging_la_LDFLAGS = -module -avoid-version $(GTK_LIBS) $(DBUS_LIBS)
 
 if PLUGINS
 
@@ -18,7 +18,6 @@
 
 
 CLEANFILES              = music-messaging-bindings.c
-musicmessaging_la_LDFLAGS += $(DBUS_LIBS)
 
 .PHONY: always
 
diff -r f191b5bc199b -r 1a2eaba2bc13 src/protocols/sametime/Makefile.am
--- a/src/protocols/sametime/Makefile.am	Sat Sep 03 15:01:56 2005 +0000
+++ b/src/protocols/sametime/Makefile.am	Sun Sep 04 02:03:48 2005 +0000
@@ -8,21 +8,21 @@
 
 noinst_HEADERS = sametime.h
 
-sametime_SOURCES = sametime.c
+SAMETIMESOURCES = sametime.c
 
 
 if STATIC_SAMETIME
 
 st = -DGAIM_STATIC_PRPL
 noinst_LIBRARIES   = libsametime.a
-libsametime_a_SOURCES = $(sametime_SOURCES)
+libsametime_a_SOURCES = $(SAMETIMESOURCES)
 libsametime_a_CFLAGS  = $(AM_CFLAGS)
 
 else
 
 st =
 pkg_LTLIBRARIES     = libsametime.la
-libsametime_la_SOURCES = $(sametime_SOURCES)
+libsametime_la_SOURCES = $(SAMETIMESOURCES)
 
 
 endif
diff -r f191b5bc199b -r 1a2eaba2bc13 src/protocols/sametime/meanwhile/Makefile.am
--- a/src/protocols/sametime/meanwhile/Makefile.am	Sat Sep 03 15:01:56 2005 +0000
+++ b/src/protocols/sametime/meanwhile/Makefile.am	Sun Sep 04 02:03:48 2005 +0000
@@ -17,7 +17,7 @@
 	mw_util.h 
 
 
-meanwhile_SOURCES = \
+MEANWHILESOURCES = \
 	channel.c \
 	cipher.c \
 	common.c \
@@ -40,7 +40,7 @@
 	$(DEBUG_CFLAGS) \
 	-I$(top_srcdir)/src 
 
-libmeanwhile_la_SOURCES = $(meanwhile_SOURCES)
+libmeanwhile_la_SOURCES = $(MEANWHILESOURCES)
 st =
 noinst_LTLIBRARIES = libmeanwhile.la