Mercurial > pidgin
changeset 8082:6b1ecf40f3ba
[gaim-migrate @ 8781]
re-fix static prpls now that perl is un-broken. or something like that.
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Mon, 12 Jan 2004 05:47:57 +0000 |
| parents | c76d7f5ab335 |
| children | 08d993c1d843 |
| files | src/plugin.h src/protocols/gg/Makefile.am src/protocols/irc/Makefile.am src/protocols/jabber/Makefile.am src/protocols/msn/Makefile.am src/protocols/napster/Makefile.am src/protocols/oscar/Makefile.am src/protocols/toc/Makefile.am src/protocols/trepia/Makefile.am src/protocols/yahoo/Makefile.am src/protocols/zephyr/Makefile.am |
| diffstat | 11 files changed, 12 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/plugin.h Mon Jan 12 05:42:09 2004 +0000 +++ b/src/plugin.h Mon Jan 12 05:47:57 2004 +0000 @@ -117,8 +117,7 @@ /** * Handles the initialization of modules. */ -//if !defined(GAIM_PLUGINS) || defined(STATIC) -#if !defined(GAIM_PLUGINS) +#if !defined(GAIM_PLUGINS) || defined(GAIM_STATIC_PRPL) # define GAIM_INIT_PLUGIN(pluginname, initfunc, plugininfo) \ gboolean gaim_init_##pluginname##_plugin(void) { \ GaimPlugin *plugin = gaim_plugin_new(TRUE, NULL); \ @@ -126,8 +125,7 @@ initfunc((plugin)); \ return gaim_plugin_register(plugin); \ } -//else /* GAIM_PLUGINS && !STATIC */ -#else /* GAIM_PLUGINS */ +#else /* GAIM_PLUGINS && !GAIM_STATIC_PRPL */ # define GAIM_INIT_PLUGIN(pluginname, initfunc, plugininfo) \ G_MODULE_EXPORT gboolean gaim_init_plugin(GaimPlugin *plugin) { \ plugin->info = &(plugininfo); \
--- a/src/protocols/gg/Makefile.am Mon Jan 12 05:42:09 2004 +0000 +++ b/src/protocols/gg/Makefile.am Mon Jan 12 05:47:57 2004 +0000 @@ -16,7 +16,7 @@ if STATIC_GG -st = -DSTATIC +st = -DGAIM_STATIC_PRPL noinst_LIBRARIES = libgg.a libgg_a_SOURCES = $(GGSOURCES)
--- a/src/protocols/irc/Makefile.am Mon Jan 12 05:42:09 2004 +0000 +++ b/src/protocols/irc/Makefile.am Mon Jan 12 05:47:57 2004 +0000 @@ -10,7 +10,7 @@ if STATIC_IRC -st = -DSTATIC +st = -DGAIM_STATIC_PRPL noinst_LIBRARIES = libirc.a pkg_LTLIBRARIES =
--- a/src/protocols/jabber/Makefile.am Mon Jan 12 05:42:09 2004 +0000 +++ b/src/protocols/jabber/Makefile.am Mon Jan 12 05:47:57 2004 +0000 @@ -38,7 +38,7 @@ if STATIC_JABBER -st = -DSTATIC +st = -DGAIM_STATIC_PRPL noinst_LIBRARIES = libjabber.a pkg_LTLIBRARIES =
--- a/src/protocols/msn/Makefile.am Mon Jan 12 05:42:09 2004 +0000 +++ b/src/protocols/msn/Makefile.am Mon Jan 12 05:47:57 2004 +0000 @@ -44,7 +44,7 @@ if STATIC_MSN -st = -DSTATIC +st = -DGAIM_STATIC_PRPL noinst_LIBRARIES = libmsn.a libmsn_a_SOURCES = $(MSNSOURCES) libmsn_a_CFLAGS = $(AM_CFLAGS)
--- a/src/protocols/napster/Makefile.am Mon Jan 12 05:42:09 2004 +0000 +++ b/src/protocols/napster/Makefile.am Mon Jan 12 05:47:57 2004 +0000 @@ -8,7 +8,7 @@ if STATIC_NAPSTER -st = -DSTATIC +st = -DGAIM_STATIC_PRPL noinst_LIBRARIES = libnapster.a libnapster_a_SOURCES = $(NAPSTERSOURCES) libnapster_a_CFLAGS = $(AM_CFLAGS)
--- a/src/protocols/oscar/Makefile.am Mon Jan 12 05:42:09 2004 +0000 +++ b/src/protocols/oscar/Makefile.am Mon Jan 12 05:47:57 2004 +0000 @@ -52,7 +52,7 @@ if STATIC_OSCAR -st = -DSTATIC +st = -DGAIM_STATIC_PRPL noinst_LIBRARIES = liboscar.a liboscar_a_SOURCES = $(OSCARSOURCES) liboscar_a_CFLAGS = $(AM_CFLAGS)
--- a/src/protocols/toc/Makefile.am Mon Jan 12 05:42:09 2004 +0000 +++ b/src/protocols/toc/Makefile.am Mon Jan 12 05:47:57 2004 +0000 @@ -12,7 +12,7 @@ if STATIC_TOC -st = -DSTATIC +st = -DGAIM_STATIC_PRPL noinst_LIBRARIES = libtoc.a libtoc_a_SOURCES = $(TOCSOURCES) libtoc_a_CFLAGS = $(AM_CFLAGS)
--- a/src/protocols/trepia/Makefile.am Mon Jan 12 05:42:09 2004 +0000 +++ b/src/protocols/trepia/Makefile.am Mon Jan 12 05:47:57 2004 +0000 @@ -14,7 +14,7 @@ if STATIC_TREPIA -st = -DSTATIC +st = -DGAIM_STATIC_PRPL noinst_LIBRARIES = libtrepia.a libtrepia_a_SOURCES = $(TREPIASOURCES) libtrepia_a_CFLAGS = $(AM_CFLAGS)
--- a/src/protocols/yahoo/Makefile.am Mon Jan 12 05:42:09 2004 +0000 +++ b/src/protocols/yahoo/Makefile.am Mon Jan 12 05:47:57 2004 +0000 @@ -19,7 +19,7 @@ if STATIC_YAHOO -st = -DSTATIC +st = -DGAIM_STATIC_PRPL noinst_LIBRARIES = libyahoo.a libyahoo_a_SOURCES = $(YAHOOSOURCES) libyahoo_a_CFLAGS = $(AM_CFLAGS)
--- a/src/protocols/zephyr/Makefile.am Mon Jan 12 05:42:09 2004 +0000 +++ b/src/protocols/zephyr/Makefile.am Mon Jan 12 05:47:57 2004 +0000 @@ -73,7 +73,7 @@ if STATIC_ZEPHYR -st = -DSTATIC -Dlint +st = -DGAIM_STATIC_PRPL -Dlint noinst_LIBRARIES = libzephyr.a libzephyr_a_SOURCES = $(ZEPHYRSOURCES) libzephyr_a_CFLAGS = $(AM_CFLAGS)