Mercurial > pidgin

changeset 24389:2b62300d2c19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use libtool to build static archives when --with-static-prpls is passed to configure. Does anyone know why we weren't using libtool before? We were building old-fashioned .a files. But libtool archives (.la) can contain either static or shared libraries. I found it a lot easier to get static prpl compilation working after making this change (that is to say, it worked). Without this I got this error, which is probably fixable, but consistently using libtool seems like it makes things easier: *** Warning: Linking the shared library libpurple.la against the *** static library ../libpurple/protocols/msn/libmsn.a is not portable! /usr/bin/ld: ../libpurple/protocols/msn/libmsn.a(libmsn_a-msn.o): relocation R_X86_64_32 against `a local symbol' can not be used when making a shared object; recompile with -fPIC ../libpurple/protocols/msn/libmsn.a: could not read symbols: Bad value collect2: ld returned 1 exit status
author Mark Doliner <mark@kingant.net>
date Wed, 12 Nov 2008 11:30:51 +0000
parents 7e8175f9b009
children c6c714b7841d
files configure.ac libpurple/protocols/bonjour/Makefile.am libpurple/protocols/gg/Makefile.am libpurple/protocols/irc/Makefile.am libpurple/protocols/jabber/Makefile.am libpurple/protocols/msn/Makefile.am libpurple/protocols/msnp9/Makefile.am libpurple/protocols/myspace/Makefile.am libpurple/protocols/novell/Makefile.am libpurple/protocols/null/Makefile.am libpurple/protocols/oscar/Makefile.am libpurple/protocols/qq/Makefile.am libpurple/protocols/sametime/Makefile.am libpurple/protocols/silc/Makefile.am libpurple/protocols/silc10/Makefile.am libpurple/protocols/simple/Makefile.am libpurple/protocols/toc/Makefile.am libpurple/protocols/yahoo/Makefile.am libpurple/protocols/zephyr/Makefile.am
diffstat 19 files changed, 141 insertions(+), 147 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Wed Nov 12 09:40:05 2008 +0000
+++ b/configure.ac	Wed Nov 12 11:30:51 2008 +0000
@@ -1010,23 +1010,23 @@
 extern_init=
 load_proto=
 for i in $STATIC_PRPLS ; do
-	dnl Ugly special case for "libsilcpurple.a":
+	dnl Ugly special case for "libsilcpurple.la":
 	dnl ... and Ugly special case for multi-protocol oscar
 	if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.a"
+		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
 		extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
 		extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
 		load_proto="$load_proto purple_init_aim_plugin();"
 		load_proto="$load_proto purple_init_icq_plugin();"
 	else
 		if test "x$i" = "xsilc"; then
-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.a"
+			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
 		elif test "x$i" = "xsilc10"; then
-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.a"
+			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
 		elif test "x$i" = "xmsnp9"; then
-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libmsn.a"
+			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libmsn.la"
 		else
-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.a"
+			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
 		fi
 		extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
 		load_proto="$load_proto purple_init_${i}_plugin();"
--- a/libpurple/protocols/bonjour/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/bonjour/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -30,10 +30,10 @@
 if STATIC_BONJOUR
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES     = libbonjour.a
-libbonjour_a_SOURCES = $(BONJOURSOURCES)
-libbonjour_a_CFLAGS  = $(AM_CFLAGS)
-libbonjour_a_LIBADD  = $(AVAHI_LIBS)
+noinst_LTLIBRARIES    = libbonjour.la
+libbonjour_la_SOURCES = $(BONJOURSOURCES)
+libbonjour_la_CFLAGS  = $(AM_CFLAGS)
+libbonjour_la_LIBADD  = $(AVAHI_LIBS)
 
 else
 
@@ -44,12 +44,10 @@
 
 endif
 
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS) \
 	$(LIBXML_CFLAGS) \
-	$(AVAHI_CFLAGS)
-
+	$(AVAHI_CFLAGS)
\ No newline at end of file
--- a/libpurple/protocols/gg/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/gg/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -52,19 +52,15 @@
 if STATIC_GG
 
 st = -DPURPLE_STATIC_PRPL $(GADU_CFLAGS)
-noinst_LIBRARIES = libgg.a
-pkg_LTLIBRARIES =
-
-libgg_a_SOURCES = $(GGSOURCES)
-libgg_a_CFLAGS  = $(AM_CFLAGS)
-libgg_a_LIBADD  = $(GADU_LIBS)
+noinst_LTLIBRARIES = libgg.la
+libgg_la_SOURCES = $(GGSOURCES)
+libgg_la_CFLAGS  = $(AM_CFLAGS)
+libgg_la_LIBADD  = $(GADU_LIBS)
 
 else
 
 st = $(GADU_CFLAGS)
 pkg_LTLIBRARIES = libgg.la
-noinst_LIBRARIES =
-
 libgg_la_SOURCES = $(GGSOURCES)
 libgg_la_LIBADD  = $(GLIB_LIBS) $(GADU_LIBS)
 
--- a/libpurple/protocols/irc/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/irc/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,8 +1,15 @@
-EXTRA_DIST = Makefile.mingw
+EXTRA_DIST = \
+	Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
-IRCSOURCES = irc.c parse.c cmds.c msgs.c irc.h dcc_send.c
+IRCSOURCES = \
+	cmds.c \
+	dcc_send.c \
+	irc.c \
+	irc.h \
+	msgs.c \
+	parse.c
 
 AM_CFLAGS = $(st)
 
@@ -11,18 +18,14 @@
 if STATIC_IRC
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES = libirc.a
-pkg_LTLIBRARIES =
-
-libirc_a_SOURCES = $(IRCSOURCES)
-libirc_a_CFLAGS  = $(AM_CFLAGS)
+noinst_LTLIBRARIES = libirc.la
+libirc_la_SOURCES  = $(IRCSOURCES)
+libirc_la_CFLAGS   = $(AM_CFLAGS)
 
 else
 
 st =
-pkg_LTLIBRARIES = libirc.la
-noinst_LIBRARIES =
-
+pkg_LTLIBRARIES   = libirc.la
 libirc_la_SOURCES = $(IRCSOURCES)
 libirc_la_LIBADD  = $(GLIB_LIBS)
 
--- a/libpurple/protocols/jabber/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/jabber/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
-		Makefile.mingw \
-		win32/posix.uname.c \
-		win32/utsname.h
+	Makefile.mingw \
+	win32/posix.uname.c \
+	win32/utsname.h
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -59,20 +59,16 @@
 if STATIC_JABBER
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES = libjabber.a
-pkg_LTLIBRARIES =
-
-libjabber_a_SOURCES = $(JABBERSOURCES) libxmpp.c
-libjabber_a_CFLAGS  = $(AM_CFLAGS)
+noinst_LTLIBRARIES   = libjabber.la
+libjabber_la_SOURCES = $(JABBERSOURCES) libxmpp.c
+libjabber_la_CFLAGS  = $(AM_CFLAGS)
 
 else
 
 st =
-pkg_LTLIBRARIES = libjabber.la libxmpp.la
-noinst_LIBRARIES =
-
+pkg_LTLIBRARIES      = libjabber.la libxmpp.la
 libjabber_la_SOURCES = $(JABBERSOURCES)
-libjabber_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS)
+libjabber_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS)
 
 libxmpp_la_SOURCES = libxmpp.c
 libxmpp_la_LIBADD = libjabber.la
--- a/libpurple/protocols/msn/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/msn/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
-		directconn.c \
-		directconn.h \
-		Makefile.mingw
+	directconn.c \
+	directconn.h \
+	Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -74,9 +74,9 @@
 if STATIC_MSN
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES = libmsn.a
-libmsn_a_SOURCES = $(MSNSOURCES)
-libmsn_a_CFLAGS  = $(AM_CFLAGS)
+noinst_LTLIBRARIES = libmsn.la
+libmsn_la_SOURCES  = $(MSNSOURCES)
+libmsn_la_CFLAGS   = $(AM_CFLAGS)
 
 else
 
--- a/libpurple/protocols/msnp9/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/msnp9/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-		Makefile.mingw
+	Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -70,9 +70,9 @@
 if STATIC_MSN
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES = libmsn.a
-libmsn_a_SOURCES = $(MSNP9SOURCES)
-libmsn_a_CFLAGS  = $(AM_CFLAGS)
+noinst_LTLIBRARIES = libmsn.la
+libmsn_la_SOURCES  = $(MSNP9SOURCES)
+libmsn_la_CFLAGS   = $(AM_CFLAGS)
 
 else
 
--- a/libpurple/protocols/myspace/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/myspace/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,4 +1,5 @@
-EXTRA_DIST = Makefile.mingw
+EXTRA_DIST = \
+	Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -23,9 +24,9 @@
 if STATIC_MYSPACE
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES     = libmyspace.a
-libmyspace_a_SOURCES = $(MSIMSOURCES)
-libmyspace_a_CFLAGS  = $(AM_CFLAGS)
+noinst_LTLIBRARIES    = libmyspace.la
+libmyspace_la_SOURCES = $(MSIMSOURCES)
+libmyspace_la_CFLAGS  = $(AM_CFLAGS)
 
 else
 
--- a/libpurple/protocols/novell/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/novell/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-		Makefile.mingw
+	Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -33,18 +33,14 @@
 if STATIC_NOVELL
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES = libnovell.a
-pkg_LTLIBRARIES =
-
-libnovell_a_SOURCES = $(NOVELLSOURCES)
-libnovell_a_CFLAGS = $(AM_CFLAGS)
+noinst_LTLIBRARIES   = libnovell.la
+libnovell_la_SOURCES = $(NOVELLSOURCES)
+libnovell_la_CFLAGS  = $(AM_CFLAGS)
 
 else
 
 st =
-pkg_LTLIBRARIES = libnovell.la
-noinst_LIBRARIES =
-
+pkg_LTLIBRARIES      = libnovell.la
 libnovell_la_SOURCES = $(NOVELLSOURCES)
 libnovell_la_LIBADD  = $(GLIB_LIBS)
 
--- a/libpurple/protocols/null/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/null/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,4 +1,6 @@
-EXTRA_DIST = README Makefile.mingw
+EXTRA_DIST = \
+	Makefile.mingw \
+	README
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -10,7 +12,7 @@
 
 # nullprpl isn't built by default. when it is built, it's dynamically linked.
 st =
-pkg_LTLIBRARIES   = libnull.la
+pkg_LTLIBRARIES    = libnull.la
 libnull_la_SOURCES = $(NULLSOURCES)
 libnull_la_LIBADD  = $(GLIB_LIBS)
 
--- a/libpurple/protocols/oscar/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/oscar/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
-		COPYING \
-		AUTHORS \
-		Makefile.mingw
+	COPYING \
+	AUTHORS \
+	Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -52,10 +52,9 @@
 if STATIC_OSCAR
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES   = liboscar.a
-
-liboscar_a_SOURCES = $(OSCARSOURCES) libaim.c libicq.c
-liboscar_a_CFLAGS  = $(AM_CFLAGS)
+noinst_LTLIBRARIES  = liboscar.la
+liboscar_la_SOURCES = $(OSCARSOURCES) libaim.c libicq.c
+liboscar_la_CFLAGS  = $(AM_CFLAGS)
 
 else
 
@@ -64,11 +63,11 @@
 liboscar_la_SOURCES = $(OSCARSOURCES)
 liboscar_la_LIBADD  = $(GLIB_LIBS)
 
-libaim_la_SOURCES = libaim.c
-libaim_la_LIBADD = liboscar.la
+libaim_la_SOURCES   = libaim.c
+libaim_la_LIBADD    = liboscar.la
 
-libicq_la_SOURCES = libicq.c
-libicq_la_LIBADD = liboscar.la
+libicq_la_SOURCES   = libicq.c
+libicq_la_LIBADD    = liboscar.la
 
 endif
 
--- a/libpurple/protocols/qq/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/qq/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-		Makefile.mingw
+	Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -56,9 +56,9 @@
 if STATIC_QQ
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES = libqq.a
-libqq_a_SOURCES  = $(QQSOURCES)
-libqq_a_CFLAGS   = $(AM_CFLAGS)
+noinst_LTLIBRARIES = libqq.la
+libqq_la_SOURCES   = $(QQSOURCES)
+libqq_la_CFLAGS    = $(AM_CFLAGS)
 
 else
 
--- a/libpurple/protocols/sametime/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/sametime/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,21 +1,22 @@
-
-EXTRA_DIST = Makefile.mingw
-
+EXTRA_DIST = \
+	Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
-
 noinst_HEADERS = sametime.h
 
 SAMETIMESOURCES = sametime.c
 
+AM_CFLAGS = \
+	$(st) \
+	-DG_LOG_DOMAIN=\"sametime\"
 
 if STATIC_SAMETIME
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES   = libsametime.a
-libsametime_a_SOURCES = $(SAMETIMESOURCES)
-libsametime_a_CFLAGS  = $(AM_CFLAGS)
+noinst_LTLIBRARIES     = libsametime.la
+libsametime_la_SOURCES = $(SAMETIMESOURCES)
+libsametime_la_CFLAGS  = $(AM_CFLAGS)
 
 else
 
@@ -23,22 +24,15 @@
 pkg_LTLIBRARIES     = libsametime.la
 libsametime_la_SOURCES = $(SAMETIMESOURCES)
 
-
 endif
 
-
 libsametime_la_LDFLAGS = -module -avoid-version
 libsametime_la_LIBADD = $(GLIB_LIBS) $(MEANWHILE_LIBS)
 
-
-AM_CFLAGS = \
-	$(GLIB_CFLAGS) $(MEANWHILE_CFLAGS) \
-	$(DEBUG_CFLAGS) \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
-	-I$(top_builddir)/libpurple
-
+	-I$(top_builddir)/libpurple \
+	$(DEBUG_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(MEANWHILE_CFLAGS)
 
-AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"sametime\" \
-	$(st)
-
--- a/libpurple/protocols/silc/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/silc/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,8 +1,21 @@
-EXTRA_DIST = README TODO Makefile.mingw
+EXTRA_DIST = \
+	Makefile.mingw \
+	README \
+	TODO
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
-SILCSOURCES = silc.c silcpurple.h buddy.c chat.c ft.c ops.c pk.c util.c wb.c wb.h
+SILCSOURCES = \
+	buddy.c \
+	chat.c \
+	ft.c \
+	ops.c \
+	pk.c \
+	silc.c \
+	silcpurple.h \
+	util.c \
+	wb.c \
+	wb.h
 
 AM_CFLAGS = $(st)
 
@@ -11,19 +24,15 @@
 if STATIC_SILC
 
 st = -DPURPLE_STATIC_PRPL $(SILC_CFLAGS)
-noinst_LIBRARIES = libsilcpurple.a
-pkg_LTLIBRARIES =
-
-libsilcpurple_a_SOURCES = $(SILCSOURCES)
-libsilcpurple_a_CFLAGS  = $(AM_CFLAGS)
-libsilcpurple_a_LIBADD  = $(SILC_LIBS)
+noinst_LTLIBRARIES       = libsilcpurple.la
+libsilcpurple_la_SOURCES = $(SILCSOURCES)
+libsilcpurple_la_CFLAGS  = $(AM_CFLAGS)
+libsilcpurple_la_LIBADD  = $(SILC_LIBS)
 
 else
 
 st = $(SILC_CFLAGS)
-pkg_LTLIBRARIES = libsilcpurple.la
-noinst_LIBRARIES =
-
+pkg_LTLIBRARIES          = libsilcpurple.la
 libsilcpurple_la_SOURCES = $(SILCSOURCES)
 libsilcpurple_la_LIBADD  = $(GLIB_LIBS) $(SILC_LIBS)
 
@@ -32,5 +41,6 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
+	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(DEBUG_CFLAGS)
+	$(SILC_CFLAGS)
--- a/libpurple/protocols/silc10/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/silc10/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,4 +1,7 @@
-EXTRA_DIST = README TODO Makefile.mingw
+EXTRA_DIST = \
+	Makefile.mingw \
+	README \
+	TODO
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -11,19 +14,15 @@
 if STATIC_SILC
 
 st = -DPURPLE_STATIC_PRPL $(SILC_CFLAGS)
-noinst_LIBRARIES = libsilcpurple.a
-pkg_LTLIBRARIES =
-
-libsilcpurple_a_SOURCES = $(SILCSOURCES)
-libsilcpurple_a_CFLAGS  = $(AM_CFLAGS)
-libsilcpurple_a_LIBADD  = $(SILC_LIBS)
+noinst_LTLIBRARIES       = libsilcpurple.la
+libsilcpurple_la_SOURCES = $(SILCSOURCES)
+libsilcpurple_la_CFLAGS  = $(AM_CFLAGS)
+libsilcpurple_la_LIBADD  = $(SILC_LIBS)
 
 else
 
 st = $(SILC_CFLAGS)
-pkg_LTLIBRARIES = libsilcpurple.la
-noinst_LIBRARIES =
-
+pkg_LTLIBRARIES          = libsilcpurple.la
 libsilcpurple_la_SOURCES = $(SILCSOURCES)
 libsilcpurple_la_LIBADD  = $(GLIB_LIBS) $(SILC_LIBS)
 
@@ -32,5 +31,6 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
+	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(DEBUG_CFLAGS)
+	$(SILC_CFLAGS)
--- a/libpurple/protocols/simple/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/simple/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-		Makefile.mingw
+	Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -9,21 +9,21 @@
 	sipmsg.c \
 	sipmsg.h
 
-AM_CFLAGS = $(st) 
+AM_CFLAGS = $(st)
 
 libsimple_la_LDFLAGS = -module -avoid-version
 
 if STATIC_MSN
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES = libsimple.a
-libsimple_a_SOURCES = $(SIMPLESOURCES)
-libsimple_a_CFLAGS  = $(AM_CFLAGS)
+noinst_LTLIBRARIES   = libsimple.la
+libsimple_la_SOURCES = $(SIMPLESOURCES)
+libsimple_la_CFLAGS  = $(AM_CFLAGS)
 
 else
 
 st =
-pkg_LTLIBRARIES   = libsimple.la
+pkg_LTLIBRARIES      = libsimple.la
 libsimple_la_SOURCES = $(SIMPLESOURCES)
 libsimple_la_LIBADD  = $(GLIB_LIBS)
 
--- a/libpurple/protocols/toc/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/toc/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,6 +1,6 @@
 EXTRA_DIST = \
-		PROTOCOL \
-		Makefile.mingw
+	PROTOCOL \
+	Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -13,9 +13,9 @@
 if STATIC_TOC
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES = libtoc.a
-libtoc_a_SOURCES = $(TOCSOURCES)
-libtoc_a_CFLAGS  = $(AM_CFLAGS)
+noinst_LTLIBRARIES = libtoc.la
+libtoc_la_SOURCES  = $(TOCSOURCES)
+libtoc_la_CFLAGS   = $(AM_CFLAGS)
 
 else
 
--- a/libpurple/protocols/yahoo/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/yahoo/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-		Makefile.mingw
+	Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -36,9 +36,9 @@
 if STATIC_YAHOO
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES   = libyahoo.a
-libyahoo_a_SOURCES = $(YAHOOSOURCES)
-libyahoo_a_CFLAGS  = $(AM_CFLAGS)
+noinst_LTLIBRARIES  = libyahoo.la
+libyahoo_la_SOURCES = $(YAHOOSOURCES)
+libyahoo_la_CFLAGS  = $(AM_CFLAGS)
 
 else
 
@@ -53,4 +53,4 @@
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
-	$(DEBUG_CFLAGS)
+	$(DEBUG_CFLAGS)
\ No newline at end of file
--- a/libpurple/protocols/zephyr/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/zephyr/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -62,7 +62,6 @@
 	zephyr_err.c \
 	zephyr_err.h \
 	zephyr_internal.h \
-	\
 	zephyr.c
 
 ZEPHYRSOURCESEXT = zephyr.c
@@ -78,10 +77,10 @@
 if STATIC_ZEPHYR
 
 st = -DPURPLE_STATIC_PRPL -Dlint
-noinst_LIBRARIES = libzephyr.a
-libzephyr_a_SOURCES = $(ZEPHYRSOURCES)
-libzephyr_a_CFLAGS  = $(AM_CFLAGS)
-libzephyr_a_LIBADD  = $(ZEPHYRLIBS)
+noinst_LTLIBRARIES   = libzephyr.la
+libzephyr_la_SOURCES = $(ZEPHYRSOURCES)
+libzephyr_la_CFLAGS  = $(AM_CFLAGS)
+libzephyr_la_LIBADD  = $(ZEPHYRLIBS)
 
 else
 
@@ -90,7 +89,7 @@
 
 if EXTERNAL_LIBZEPHYR
 libzephyr_la_SOURCES = $(ZEPHYRSOURCESEXT)
-libzephyr_la_LIBADD = $(GLIB_LIBS) $(ZEPHYRLIBSEXT)
+libzephyr_la_LIBADD  = $(GLIB_LIBS) $(ZEPHYRLIBSEXT)
 else
 libzephyr_la_SOURCES = $(ZEPHYRSOURCES)
 libzephyr_la_LIBADD  = $(GLIB_LIBS) $(ZEPHYRLIBS)