diff libpurple/protocols/silc/Makefile.am @ 24389:2b62300d2c19

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

--- 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)