pidgin: 6b1ddf51: Use libtool to build static archives whe...
markdoliner at pidgin.im
markdoliner at pidgin.im
Wed Nov 12 06:35:22 EST 2008
-----------------------------------------------------------------
Revision: 6b1ddf5181d175d53d255fc96384ed8da3708aed
Ancestor: bc80dc424bc7a7e274901f9124173538e5b43f41
Author: markdoliner at pidgin.im
Date: 2008-11-12T11:30:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6b1ddf5181d175d53d255fc96384ed8da3708aed
Modified 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
ChangeLog:
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
-------------- next part --------------
============================================================
--- configure.ac edbd01859b54edf52cbc027ab4cc929f788e1a10
+++ configure.ac 296e9d3d5a0fd452d3738a2406f26d4c59ffc29a
@@ -1010,23 +1010,23 @@ for i in $STATIC_PRPLS ; do
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();"
============================================================
--- libpurple/protocols/bonjour/Makefile.am 65cf96aa0a7ff7ed33cb588864d5b5ff05632b2c
+++ libpurple/protocols/bonjour/Makefile.am 474b55b41a9f7bb6c7644bce36f59ffbb05565f6
@@ -30,10 +30,10 @@ st = -DPURPLE_STATIC_PRPL
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
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
============================================================
--- libpurple/protocols/gg/Makefile.am 26022946ed1e81956c8d175fc645bbcc75767bf4
+++ libpurple/protocols/gg/Makefile.am f5308fc67360a9eea653c1d7c6b624e6e9bc8525
@@ -52,19 +52,15 @@ st = -DPURPLE_STATIC_PRPL $(GADU_CFLAGS)
if STATIC_GG
st = -DPURPLE_STATIC_PRPL $(GADU_CFLAGS)
-noinst_LIBRARIES = libgg.a
-pkg_LTLIBRARIES =
+noinst_LTLIBRARIES = libgg.la
+libgg_la_SOURCES = $(GGSOURCES)
+libgg_la_CFLAGS = $(AM_CFLAGS)
+libgg_la_LIBADD = $(GADU_LIBS)
-libgg_a_SOURCES = $(GGSOURCES)
-libgg_a_CFLAGS = $(AM_CFLAGS)
-libgg_a_LIBADD = $(GADU_LIBS)
-
else
st = $(GADU_CFLAGS)
pkg_LTLIBRARIES = libgg.la
-noinst_LIBRARIES =
-
libgg_la_SOURCES = $(GGSOURCES)
libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS)
============================================================
--- libpurple/protocols/irc/Makefile.am 8f746278bf83decfb590d057650d750e36d665e0
+++ libpurple/protocols/irc/Makefile.am 46e38d6c53d483126f20fed27c5f092c164d2987
@@ -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 @@ st = -DPURPLE_STATIC_PRPL
if STATIC_IRC
st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES = libirc.a
-pkg_LTLIBRARIES =
+noinst_LTLIBRARIES = libirc.la
+libirc_la_SOURCES = $(IRCSOURCES)
+libirc_la_CFLAGS = $(AM_CFLAGS)
-libirc_a_SOURCES = $(IRCSOURCES)
-libirc_a_CFLAGS = $(AM_CFLAGS)
-
else
st =
-pkg_LTLIBRARIES = libirc.la
-noinst_LIBRARIES =
-
+pkg_LTLIBRARIES = libirc.la
libirc_la_SOURCES = $(IRCSOURCES)
libirc_la_LIBADD = $(GLIB_LIBS)
============================================================
--- libpurple/protocols/jabber/Makefile.am e813fba2b70462aa27685581de86e4c0b835a7ad
+++ libpurple/protocols/jabber/Makefile.am e3276e95fbecbfde45648765303ba4cbc1acd38b
@@ -1,7 +1,7 @@ EXTRA_DIST = \
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 @@ st = -DPURPLE_STATIC_PRPL
if STATIC_JABBER
st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES = libjabber.a
-pkg_LTLIBRARIES =
+noinst_LTLIBRARIES = libjabber.la
+libjabber_la_SOURCES = $(JABBERSOURCES) libxmpp.c
+libjabber_la_CFLAGS = $(AM_CFLAGS)
-libjabber_a_SOURCES = $(JABBERSOURCES) libxmpp.c
-libjabber_a_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
============================================================
--- libpurple/protocols/msn/Makefile.am df3563cf5b8cbbea8c125b61bb9a057c6fa29334
+++ libpurple/protocols/msn/Makefile.am bc0d9535367c5da381e6515af27b49fb54888e96
@@ -1,7 +1,7 @@ EXTRA_DIST = \
EXTRA_DIST = \
- directconn.c \
- directconn.h \
- Makefile.mingw
+ directconn.c \
+ directconn.h \
+ Makefile.mingw
pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
@@ -74,9 +74,9 @@ st = -DPURPLE_STATIC_PRPL
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
============================================================
--- libpurple/protocols/msnp9/Makefile.am abb8580629e70836efed2dd5724c724b478be896
+++ libpurple/protocols/msnp9/Makefile.am 39e457b1c689539205a9bc4752492d0b4d5dbd7f
@@ -1,5 +1,5 @@ EXTRA_DIST = \
EXTRA_DIST = \
- Makefile.mingw
+ Makefile.mingw
pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
@@ -70,9 +70,9 @@ st = -DPURPLE_STATIC_PRPL
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
============================================================
--- libpurple/protocols/myspace/Makefile.am 3ad4c13e3156e97e72e36f680bfcbb2401f33131
+++ libpurple/protocols/myspace/Makefile.am 42fb944cd11587c6fd12ce66b648ea6c0cd247bc
@@ -1,4 +1,5 @@
-EXTRA_DIST = Makefile.mingw
+EXTRA_DIST = \
+ Makefile.mingw
pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
@@ -23,9 +24,9 @@ st = -DPURPLE_STATIC_PRPL
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
============================================================
--- libpurple/protocols/novell/Makefile.am 0d09d09a929d9003140e964c34d0d8e89baf246d
+++ libpurple/protocols/novell/Makefile.am 2b78f14e51a7a16863761efc9475a7659ab1fb61
@@ -1,5 +1,5 @@ EXTRA_DIST = \
EXTRA_DIST = \
- Makefile.mingw
+ Makefile.mingw
pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
@@ -33,18 +33,14 @@ st = -DPURPLE_STATIC_PRPL
if STATIC_NOVELL
st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES = libnovell.a
-pkg_LTLIBRARIES =
+noinst_LTLIBRARIES = libnovell.la
+libnovell_la_SOURCES = $(NOVELLSOURCES)
+libnovell_la_CFLAGS = $(AM_CFLAGS)
-libnovell_a_SOURCES = $(NOVELLSOURCES)
-libnovell_a_CFLAGS = $(AM_CFLAGS)
-
else
st =
-pkg_LTLIBRARIES = libnovell.la
-noinst_LIBRARIES =
-
+pkg_LTLIBRARIES = libnovell.la
libnovell_la_SOURCES = $(NOVELLSOURCES)
libnovell_la_LIBADD = $(GLIB_LIBS)
============================================================
--- libpurple/protocols/null/Makefile.am 478bea9a4974911685f99013a288eb33af9ee1ff
+++ libpurple/protocols/null/Makefile.am d2765f08974fc534d8a5e243d26e9209f0011bff
@@ -1,4 +1,6 @@
-EXTRA_DIST = README Makefile.mingw
+EXTRA_DIST = \
+ Makefile.mingw \
+ README
pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
@@ -10,7 +12,7 @@ st =
# 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)
============================================================
--- libpurple/protocols/oscar/Makefile.am 16ff94007ad4ffa0a056d98af0a4c72c27999d49
+++ libpurple/protocols/oscar/Makefile.am c9d9752b242c1586795dac38508de9f1b9ed6024
@@ -1,7 +1,7 @@ EXTRA_DIST = \
EXTRA_DIST = \
- COPYING \
- AUTHORS \
- Makefile.mingw
+ COPYING \
+ AUTHORS \
+ Makefile.mingw
pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
@@ -52,11 +52,10 @@ st = -DPURPLE_STATIC_PRPL
if STATIC_OSCAR
st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES = liboscar.a
+noinst_LTLIBRARIES = liboscar.la
+liboscar_la_SOURCES = $(OSCARSOURCES) libaim.c libicq.c
+liboscar_la_CFLAGS = $(AM_CFLAGS)
-liboscar_a_SOURCES = $(OSCARSOURCES) libaim.c libicq.c
-liboscar_a_CFLAGS = $(AM_CFLAGS)
-
else
st =
@@ -64,11 +63,11 @@ liboscar_la_LIBADD = $(GLIB_LIBS)
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
============================================================
--- libpurple/protocols/qq/Makefile.am cd2d4c4c0834493c513a7b584c780f826a52517b
+++ libpurple/protocols/qq/Makefile.am 020c5382862872d6ba26e640519d6ade314792c2
@@ -1,5 +1,5 @@ EXTRA_DIST = \
EXTRA_DIST = \
- Makefile.mingw
+ Makefile.mingw
pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
@@ -56,9 +56,9 @@ st = -DPURPLE_STATIC_PRPL
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
============================================================
--- libpurple/protocols/sametime/Makefile.am 16a212ab596ed982bfb5c3d08423d7e0d386ff15
+++ libpurple/protocols/sametime/Makefile.am f4678eaa367453b46072478a8352656c4aa21c1d
@@ -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 @@ libsametime_la_SOURCES = $(SAMETIMESOURC
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)
-
============================================================
--- libpurple/protocols/silc/Makefile.am 3630d5c84542dc5661ae8731d6948b9988c5b96d
+++ libpurple/protocols/silc/Makefile.am 9027e8798472f9337fe234981756294b425864ea
@@ -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 @@ st = -DPURPLE_STATIC_PRPL $(SILC_CFLAGS)
if STATIC_SILC
st = -DPURPLE_STATIC_PRPL $(SILC_CFLAGS)
-noinst_LIBRARIES = libsilcpurple.a
-pkg_LTLIBRARIES =
+noinst_LTLIBRARIES = libsilcpurple.la
+libsilcpurple_la_SOURCES = $(SILCSOURCES)
+libsilcpurple_la_CFLAGS = $(AM_CFLAGS)
+libsilcpurple_la_LIBADD = $(SILC_LIBS)
-libsilcpurple_a_SOURCES = $(SILCSOURCES)
-libsilcpurple_a_CFLAGS = $(AM_CFLAGS)
-libsilcpurple_a_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 = \
AM_CPPFLAGS = \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
+ $(DEBUG_CFLAGS) \
$(GLIB_CFLAGS) \
- $(DEBUG_CFLAGS)
+ $(SILC_CFLAGS)
============================================================
--- libpurple/protocols/silc10/Makefile.am 3630d5c84542dc5661ae8731d6948b9988c5b96d
+++ libpurple/protocols/silc10/Makefile.am 62d8f3edb8604438593e88835e3771e2216e4494
@@ -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 @@ st = -DPURPLE_STATIC_PRPL $(SILC_CFLAGS)
if STATIC_SILC
st = -DPURPLE_STATIC_PRPL $(SILC_CFLAGS)
-noinst_LIBRARIES = libsilcpurple.a
-pkg_LTLIBRARIES =
+noinst_LTLIBRARIES = libsilcpurple.la
+libsilcpurple_la_SOURCES = $(SILCSOURCES)
+libsilcpurple_la_CFLAGS = $(AM_CFLAGS)
+libsilcpurple_la_LIBADD = $(SILC_LIBS)
-libsilcpurple_a_SOURCES = $(SILCSOURCES)
-libsilcpurple_a_CFLAGS = $(AM_CFLAGS)
-libsilcpurple_a_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 = \
AM_CPPFLAGS = \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
+ $(DEBUG_CFLAGS) \
$(GLIB_CFLAGS) \
- $(DEBUG_CFLAGS)
+ $(SILC_CFLAGS)
============================================================
--- libpurple/protocols/simple/Makefile.am f5e12137cb092e9156e956e4c5a589e023968e33
+++ libpurple/protocols/simple/Makefile.am 13b5d52ee954544c6b77b4b75a48eb65fdcf014b
@@ -1,5 +1,5 @@ EXTRA_DIST = \
EXTRA_DIST = \
- Makefile.mingw
+ Makefile.mingw
pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
@@ -9,21 +9,21 @@ SIMPLESOURCES = \
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)
============================================================
--- libpurple/protocols/toc/Makefile.am 43d1987e496e6845d5abbb380f1c217fe9118160
+++ libpurple/protocols/toc/Makefile.am a30a142d6a9424cf41e9897065d95d1d156a55e8
@@ -1,6 +1,6 @@ EXTRA_DIST = \
EXTRA_DIST = \
- PROTOCOL \
- Makefile.mingw
+ PROTOCOL \
+ Makefile.mingw
pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
@@ -13,9 +13,9 @@ st = -DPURPLE_STATIC_PRPL
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
============================================================
--- libpurple/protocols/yahoo/Makefile.am a8545b8ab4399e74e03b41fdbd6fcd35b95e5f31
+++ libpurple/protocols/yahoo/Makefile.am eaf9c3dc7fa9d6426f3911a238c9bc6c39ad806a
@@ -1,5 +1,5 @@ EXTRA_DIST = \
EXTRA_DIST = \
- Makefile.mingw
+ Makefile.mingw
pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
@@ -36,9 +36,9 @@ st = -DPURPLE_STATIC_PRPL
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 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
$(GLIB_CFLAGS) \
- $(DEBUG_CFLAGS)
+ $(DEBUG_CFLAGS)
\ No newline at end of file
============================================================
--- libpurple/protocols/zephyr/Makefile.am f64380a954909958eb6ec689d52c959e01f8d792
+++ libpurple/protocols/zephyr/Makefile.am 85a1cab4ed6adeefb04eac2858bf3feaff409f7e
@@ -62,7 +62,6 @@ ZEPHYRSOURCES = \
zephyr_err.c \
zephyr_err.h \
zephyr_internal.h \
- \
zephyr.c
ZEPHYRSOURCESEXT = zephyr.c
@@ -78,10 +77,10 @@ st = -DPURPLE_STATIC_PRPL -Dlint
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 @@ libzephyr_la_SOURCES = $(ZEPHYRSOURCESEX
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)
More information about the Commits
mailing list