Mercurial > pidgin
changeset 26359:e33a91b8b8f6
Clean unnecessary changes out of the Makefiles.
line wrap: on
line diff
--- a/finch/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/finch/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -71,7 +71,6 @@ $(INTLLIBS) \ $(GLIB_LIBS) \ $(LIBXML_LIBS) \ - $(FARSIGHT_LIBS) \ $(GNT_LIBS) \ $(GSTREAMER_LIBS) \ ./libgnt/libgnt.la \ @@ -91,6 +90,5 @@ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(LIBXML_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ $(GSTREAMER_CFLAGS) \ $(GNT_CFLAGS)
--- a/finch/libgnt/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/finch/libgnt/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -91,7 +91,6 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ $(GNT_CFLAGS) \ $(DEBUG_CFLAGS) \ $(LIBXML_CFLAGS) \
--- a/finch/libgnt/wms/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/finch/libgnt/wms/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -36,6 +36,5 @@ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ $(GNT_CFLAGS) \ - $(PLUGIN_CFLAGS) \ - $(FARSIGHT_CFLAGS) + $(PLUGIN_CFLAGS)
--- a/finch/plugins/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/finch/plugins/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -42,7 +42,6 @@ -I$(top_srcdir)/finch \ -I$(top_srcdir)/finch/libgnt \ $(DEBUG_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ $(GLIB_CFLAGS) \ $(GNT_CFLAGS) \ $(PLUGIN_CFLAGS)
--- a/libpurple/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -281,7 +281,6 @@ $(INTLLIBS) \ $(FARSIGHT_LIBS) \ $(GSTREAMER_LIBS) \ - $(GSTPROPS_LIBS) \ -lm AM_CPPFLAGS = \ @@ -296,7 +295,6 @@ $(LIBXML_CFLAGS) \ $(FARSIGHT_CFLAGS) \ $(GSTREAMER_CFLAGS) \ - $(GSTPROPS_CFLAGS) \ $(NETWORKMANAGER_CFLAGS) # INSTALL_SSL_CERTIFICATES is true when SSL_CERTIFICATES_DIR is empty.
--- a/libpurple/example/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/example/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -8,7 +8,6 @@ $(INTLLIBS) \ $(GLIB_LIBS) \ $(LIBXML_LIBS) \ - $(FARSIGHT_LIBS) \ $(top_builddir)/libpurple/libpurple.la AM_CPPFLAGS = \ @@ -24,5 +23,4 @@ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ $(LIBXML_CFLAGS)
--- a/libpurple/plugins/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/plugins/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -144,9 +144,6 @@ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ $(DEBUG_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXML_CFLAGS) \ $(GLIB_CFLAGS) \ $(PLUGIN_CFLAGS) \ $(DBUS_CFLAGS)
--- a/libpurple/plugins/perl/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/plugins/perl/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -5,7 +5,7 @@ plugin_LTLIBRARIES = perl.la perl_la_LDFLAGS = -module -avoid-version -perl_la_LIBADD = $(GLIB_LIBS) $(PERL_LIBS) $(FARSIGHT_LIBS) +perl_la_LIBADD = $(GLIB_LIBS) $(PERL_LIBS) perl_la_SOURCES = \ perl.c \ perl-common.c \ @@ -167,5 +167,4 @@ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ $(PLUGIN_CFLAGS) \ - $(PERL_CFLAGS) \ - $(FARSIGHT_CFLAGS) + $(PERL_CFLAGS)
--- a/libpurple/plugins/ssl/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/plugins/ssl/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -52,9 +52,6 @@ -I$(top_builddir)/libpurple \ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXML_CFLAGS) \ $(PLUGIN_CFLAGS) ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
--- a/libpurple/plugins/tcl/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/plugins/tcl/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -7,7 +7,7 @@ tcl_la_SOURCES = tcl.c tcl_glib.c tcl_glib.h tcl_cmds.c tcl_signals.c tcl_purple.h \ tcl_ref.c tcl_cmd.c -tcl_la_LIBADD = $(GLIB_LIBS) $(TCL_LIBS) $(TK_LIBS) $(FARSIGHT_LIBS) +tcl_la_LIBADD = $(GLIB_LIBS) $(TCL_LIBS) $(TK_LIBS) EXTRA_DIST = signal-test.tcl Makefile.mingw @@ -18,6 +18,5 @@ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ $(PLUGIN_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ $(TK_CFLAGS) \ $(TCL_CFLAGS)
--- a/libpurple/protocols/bonjour/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/bonjour/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -50,11 +50,4 @@ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS) \ $(LIBXML_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXML_CFLAGS) - -#if MDNS_AVAHI -# AM_CPPFLAGS += $(AVAHI_CFLAGS) -#else -#endif + $(AVAHI_CFLAGS) \ No newline at end of file
--- a/libpurple/protocols/gg/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/gg/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -71,8 +71,5 @@ -I$(top_builddir)/libpurple \ $(INTGG_CFLAGS) \ $(GLIB_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXML_CFLAGS) \ $(DEBUG_CFLAGS)
--- a/libpurple/protocols/irc/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/irc/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -35,6 +35,4 @@ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ $(DEBUG_CFLAGS)
--- a/libpurple/protocols/jabber/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/jabber/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -96,6 +96,4 @@ -I$(top_builddir)/libpurple \ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ $(LIBXML_CFLAGS)
--- a/libpurple/protocols/msn/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/msn/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -91,7 +91,4 @@ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ - $(DEBUG_CFLAGS) \ - $(FARSIGHT_CFLAGS) - $(GSTREAMER_CFLAGS) \ - $(LIBXML_CFLAGS) + $(DEBUG_CFLAGS)
--- a/libpurple/protocols/msnp9/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/msnp9/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -87,8 +87,4 @@ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ - $(DEBUG_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXML_CFLAGS) - + $(DEBUG_CFLAGS)
--- a/libpurple/protocols/myspace/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/myspace/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -41,7 +41,4 @@ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(DEBUG_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXML_CFLAGS) + $(DEBUG_CFLAGS)
--- a/libpurple/protocols/novell/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/novell/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -50,8 +50,4 @@ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ $(DEBUG_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXML_CFLAGS) - + $(GLIB_CFLAGS)
--- a/libpurple/protocols/oscar/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/oscar/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -75,8 +75,4 @@ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(DEBUG_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXML_CFLAGS) - + $(DEBUG_CFLAGS)
--- a/libpurple/protocols/qq/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/qq/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -76,8 +76,4 @@ -I$(top_builddir)/libpurple \ -DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \ $(DEBUG_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXML_CFLAGS) - + $(GLIB_CFLAGS)
--- a/libpurple/protocols/sametime/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/sametime/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -33,6 +33,5 @@ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ $(MEANWHILE_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ -DG_LOG_DOMAIN=\"sametime\"
--- a/libpurple/protocols/silc/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/silc/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -34,7 +34,7 @@ st = $(SILC_CFLAGS) pkg_LTLIBRARIES = libsilcpurple.la libsilcpurple_la_SOURCES = $(SILCSOURCES) -libsilcpurple_la_LIBADD = $(GLIB_LIBS) $(SILC_LIBS) $(FARSIGHT_LIBS) +libsilcpurple_la_LIBADD = $(GLIB_LIBS) $(SILC_LIBS) endif @@ -43,7 +43,4 @@ -I$(top_builddir)/libpurple \ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ - $(SILC_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXML_CFLAGS) + $(SILC_CFLAGS)
--- a/libpurple/protocols/simple/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/simple/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -33,8 +33,4 @@ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(DEBUG_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXML_CFLAGS) - + $(DEBUG_CFLAGS)
--- a/libpurple/protocols/yahoo/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/yahoo/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -53,8 +53,4 @@ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(DEBUG_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXML_CFLAGS) - + $(DEBUG_CFLAGS) \ No newline at end of file
--- a/libpurple/protocols/zephyr/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/libpurple/protocols/zephyr/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -105,9 +105,5 @@ -I$(top_srcdir)/libpurple/protocols \ -DCONFDIR=\"$(sysconfdir)\" \ $(GLIB_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ $(KRB4_CFLAGS) \ - $(DEBUG_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXML_CFLAGS) - + $(DEBUG_CFLAGS)
--- a/pidgin/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/pidgin/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -209,8 +209,6 @@ $(STARTUP_NOTIFICATION_LIBS) \ $(LIBXML_LIBS) \ $(GTK_LIBS) \ - $(FARSIGHT_LIBS) \ - $(GSTPROPS_LIBS) \ $(top_builddir)/libpurple/libpurple.la if USE_INTERNAL_LIBGADU @@ -235,7 +233,5 @@ $(GTKSPELL_CFLAGS) \ $(STARTUP_NOTIFICATION_CFLAGS) \ $(LIBXML_CFLAGS) \ - $(INTGG_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(GSTPROPS_CFLAGS) + $(INTGG_CFLAGS) endif # ENABLE_GTK
--- a/pidgin/plugins/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/pidgin/plugins/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -123,7 +123,6 @@ -I$(top_srcdir)/libpurple \ -I$(top_srcdir)/pidgin \ $(DEBUG_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ $(GTK_CFLAGS) \ $(PLUGIN_CFLAGS)
--- a/pidgin/plugins/cap/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/pidgin/plugins/cap/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -15,7 +15,7 @@ endif -cap_la_LIBADD = $(GTK_LIBS) $(SQLITE3_LIBS) $(FARSIGHT_LIBS) $(GSTPROPS_LIBS) +cap_la_LIBADD = $(GTK_LIBS) $(SQLITE3_LIBS) AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ @@ -24,8 +24,6 @@ -I$(top_srcdir)/pidgin \ $(DEBUG_CFLAGS) \ $(GTK_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(GSTPROPS_CFLAGS) \ $(SQLITE3_CFLAGS) EXTRA_DIST = Makefile.mingw
--- a/pidgin/plugins/gestures/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/pidgin/plugins/gestures/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -23,5 +23,4 @@ -I$(top_builddir)/libpurple \ -I$(top_srcdir)/pidgin \ $(DEBUG_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ $(GTK_CFLAGS)
--- a/pidgin/plugins/gevolution/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/pidgin/plugins/gevolution/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -26,5 +26,4 @@ -I$(top_srcdir)/pidgin \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(DEBUG_CFLAGS) \ - $(GTK_CFLAGS) \ - $(FARSIGHT_CFLAGS) + $(GTK_CFLAGS)
--- a/pidgin/plugins/musicmessaging/Makefile.am Tue Mar 24 02:03:40 2009 +0000 +++ b/pidgin/plugins/musicmessaging/Makefile.am Tue Mar 24 03:38:21 2009 +0000 @@ -40,6 +40,5 @@ -I$(top_srcdir)/libpurple \ -I$(top_srcdir)/pidgin \ $(DEBUG_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ $(GTK_CFLAGS) \ $(DBUS_CFLAGS)