Mercurial > pidgin

changeset 15461:e9c12873fae0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
This renames the binary to 'pidgin', and I think it properly moves all the LIBDIR's to pidgin and purple, respectively
author Sean Egan <seanegan@gmail.com>
date Tue, 30 Jan 2007 05:27:44 +0000
parents 57c3c041b14e
children 0b6f337a46d5
files configure.ac libpurple/Makefile.am libpurple/plugin.c libpurple/plugins/Makefile.am libpurple/plugins/mono/Makefile.am libpurple/plugins/perl/Makefile.am libpurple/plugins/ssl/Makefile.am libpurple/plugins/tcl/Makefile.am libpurple/prefix.h 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/novell/Makefile.am libpurple/protocols/oscar/Makefile.am libpurple/protocols/qq/Makefile.am libpurple/protocols/sametime/Makefile.am libpurple/protocols/silc/Makefile.am libpurple/protocols/simple/Makefile.am libpurple/protocols/toc/Makefile.am libpurple/protocols/yahoo/Makefile.am libpurple/protocols/zephyr/Makefile.am pidgin/Makefile.am pidgin/plugins/Makefile.am pidgin/plugins/cap/Makefile.am pidgin/plugins/gestures/Makefile.am pidgin/plugins/ticker/Makefile.am
diffstat 28 files changed, 46 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Mon Jan 29 03:45:21 2007 +0000
+++ b/configure.ac	Tue Jan 30 05:27:44 2007 +0000
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([gaim], [2.0.0beta6], [gaim-devel@lists.sourceforge.net])
+AC_INIT([pidgin], [2.0.0beta7devel], [gaim-devel@lists.sourceforge.net])
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
--- a/libpurple/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -198,9 +198,9 @@
 
 endif
 
-lib_LTLIBRARIES = libgaim.la $(libgaim_client_lib)
+lib_LTLIBRARIES = libpurple.la $(libgaim_client_lib)
 
-libgaim_la_SOURCES = \
+libpurple_la_SOURCES = \
 	$(gaim_coresources) \
 	$(dbus_sources)
 
@@ -208,14 +208,14 @@
 	internal.h \
 	prefix.h
 
-libgaimincludedir=$(includedir)/gaim
-libgaiminclude_HEADERS = \
+libpurpleincludedir=$(includedir)/libpurple
+libpurpleinclude_HEADERS = \
 	$(gaim_coreheaders) \
 	$(dbus_headers)
 
-libgaim_la_DEPENDENCIES = $(STATIC_LINK_LIBS)
-libgaim_la_LDFLAGS = -export-dynamic
-libgaim_la_LIBADD = \
+libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS)
+libpurple_la_LDFLAGS = -export-dynamic
+libpurple_la_LIBADD = \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
 	$(LIBXML_LIBS) \
@@ -227,7 +227,7 @@
 AM_CPPFLAGS = \
 	-DBR_PTHREADS=0 \
 	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)/gaim/\" \
+	-DLIBDIR=\"$(libdir)/libpurple/\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	$(GLIB_CFLAGS) \
--- a/libpurple/plugin.c	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/plugin.c	Tue Jan 30 05:27:44 2007 +0000
@@ -1146,6 +1146,8 @@
 gaim_plugins_init(void) {
 	void *handle = gaim_plugins_get_handle();
 
+        gaim_plugins_add_search_path(LIBDIR);
+
 	gaim_signal_register(handle, "plugin-load",
 						 gaim_marshal_VOID__POINTER,
 						 NULL, 1,
--- a/libpurple/plugins/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/plugins/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -22,7 +22,7 @@
 	ssl \
 	$(TCL_DIR)
 
-plugindir = $(libdir)/gaim
+plugindir = $(libdir)/libpurple
 
 autoaccept_la_LDFLAGS       = -module -avoid-version
 autoreply_la_LDFLAGS        = -module -avoid-version
--- a/libpurple/plugins/mono/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/plugins/mono/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -5,7 +5,7 @@
 
 EXTRA_DIST = $(mono_sources)
 
-monodir = $(libdir)/gaim
+monodir = $(libdir)/libpurple
 mono_SCRIPTS = MPlugin.dll GetBuddyBack.dll
 mono_build_sources = $(addprefix $(srcdir)/, $(mono_sources))
 
--- a/libpurple/plugins/perl/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/plugins/perl/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/gaim
+plugindir = $(libdir)/libpurple
 hackdir = $(plugindir)/private
 
 perl_dirs = common
--- a/libpurple/plugins/ssl/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/plugins/ssl/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
 		Makefile.mingw
 
-plugindir = $(libdir)/gaim
+plugindir = $(libdir)/libpurple
 
 ssl_la_LDFLAGS        = -module -avoid-version
 ssl_gnutls_la_LDFLAGS = -module -avoid-version
--- a/libpurple/plugins/tcl/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/plugins/tcl/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/gaim
+plugindir = $(libdir)/libpurple
 
 tcl_la_LDFLAGS = -module -avoid-version
 
--- a/libpurple/prefix.h	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/prefix.h	Tue Jan 30 05:27:44 2007 +0000
@@ -76,7 +76,7 @@
 	#define BINDIR		(br_thread_local_store (br_prepend_prefix ((void *) "", "/bin")))
 	#define SBINDIR		(br_thread_local_store (br_prepend_prefix ((void *) "", "/sbin")))
 	#define DATADIR		(br_thread_local_store (br_prepend_prefix ((void *) "", "/share")))
-	#define LIBDIR		(br_thread_local_store (br_prepend_prefix ((void *) "", "/lib/gaim")))
+	#define LIBDIR		(br_thread_local_store (br_prepend_prefix ((void *) "", "/lib/libpurple")))
 	#define LIBEXECDIR	(br_thread_local_store (br_prepend_prefix ((void *) "", "/libexec")))
 	#define ETCDIR		(br_thread_local_store (br_prepend_prefix ((void *) "", "/etc")))
 	#define SYSCONFDIR	(br_thread_local_store (br_prepend_prefix ((void *) "", "/etc")))
--- a/libpurple/protocols/bonjour/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/protocols/bonjour/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
 		Makefile.mingw
 
-pkgdir = $(libdir)/gaim
+pkgdir = $(libdir)/libpurple
 
 BONJOURSOURCES = \
 	bonjour.c \
--- a/libpurple/protocols/gg/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/protocols/gg/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -13,7 +13,7 @@
 	lib/pubdir50.c \
 	lib/pubdir.c
 
-pkgdir = $(libdir)/gaim
+pkgdir = $(libdir)/libpurple
 
 if USE_INTERNAL_LIBGADU
 INTGGSOURCES = \
--- a/libpurple/protocols/irc/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/protocols/irc/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,6 +1,6 @@
 EXTRA_DIST = PROTOCOL Makefile.mingw
 
-pkgdir = $(libdir)/gaim
+pkgdir = $(libdir)/libpurple
 
 IRCSOURCES = irc.c parse.c cmds.c msgs.c irc.h dcc_send.c
 
--- a/libpurple/protocols/jabber/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/protocols/jabber/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -3,7 +3,7 @@
 		win32/posix.uname.c \
 		win32/utsname.h
 
-pkgdir = $(libdir)/gaim
+pkgdir = $(libdir)/libpurple
 
 JABBERSOURCES = auth.c \
 			  auth.h \
--- a/libpurple/protocols/msn/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/protocols/msn/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
 		Makefile.mingw
 
-pkgdir = $(libdir)/gaim
+pkgdir = $(libdir)/libpurple
 
 MSNSOURCES = \
 	cmdproc.c \
--- a/libpurple/protocols/novell/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/protocols/novell/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
 		Makefile.mingw
 
-pkgdir = $(libdir)/gaim
+pkgdir = $(libdir)/libpurple
 
 NOVELLSOURCES = \
 		nmfield.h \
--- a/libpurple/protocols/oscar/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/protocols/oscar/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -3,7 +3,7 @@
 		AUTHORS \
 		Makefile.mingw
 
-pkgdir = $(libdir)/gaim
+pkgdir = $(libdir)/libpurple
 
 OSCARSOURCES = \
 	bstream.c           \
--- a/libpurple/protocols/qq/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/protocols/qq/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
 		Makefile.mingw
 
-pkgdir = $(libdir)/gaim
+pkgdir = $(libdir)/libpurple
 
 QQSOURCES = \
 	buddy_info.c \
--- a/libpurple/protocols/sametime/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/protocols/sametime/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -2,7 +2,7 @@
 EXTRA_DIST = Makefile.mingw
 
 
-pkgdir = $(libdir)/gaim
+pkgdir = $(libdir)/libpurple
 
 
 noinst_HEADERS = sametime.h
--- a/libpurple/protocols/silc/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/protocols/silc/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,6 +1,6 @@
 EXTRA_DIST = README TODO Makefile.mingw
 
-pkgdir = $(libdir)/gaim
+pkgdir = $(libdir)/libpurple
 
 SILCSOURCES = silc.c silcgaim.h buddy.c chat.c ft.c ops.c pk.c util.c wb.c wb.h
 
--- a/libpurple/protocols/simple/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/protocols/simple/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
 		Makefile.mingw
 
-pkgdir = $(libdir)/gaim
+pkgdir = $(libdir)/libpurple
 
 SIMPLESOURCES = \
 	simple.c \
--- a/libpurple/protocols/toc/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/protocols/toc/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -2,7 +2,7 @@
 		PROTOCOL \
 		Makefile.mingw
 
-pkgdir = $(libdir)/gaim
+pkgdir = $(libdir)/libpurple
 
 TOCSOURCES = toc.c
 
--- a/libpurple/protocols/yahoo/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/protocols/yahoo/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
 		Makefile.mingw
 
-pkgdir = $(libdir)/gaim
+pkgdir = $(libdir)/libpurple
 
 YAHOOSOURCES = \
 	util.c \
--- a/libpurple/protocols/zephyr/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/libpurple/protocols/zephyr/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,4 +1,4 @@
-pkgdir = $(libdir)/gaim
+pkgdir = $(libdir)/libpurple
 
 ZEPHYRSOURCES = \
 	ZAsyncLocate.c \
--- a/pidgin/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/pidgin/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -59,9 +59,9 @@
 
 SUBDIRS = pixmaps plugins sounds
 
-bin_PROGRAMS = gaim
+bin_PROGRAMS = pidgin
 
-gaim_SOURCES = \
+pidgin_SOURCES = \
 	eggtrayicon.c \
 	gaimcombobox.c \
 	gaimstock.c \
@@ -106,7 +106,7 @@
 	gtkutils.c \
 	gtkwhiteboard.c
 
-gaim_headers = \
+pidgin_headers = \
 	eggtrayicon.h \
 	gtkaccount.h \
 	gtkblist.h \
@@ -154,14 +154,14 @@
 	gtkutils.h \
 	gtkwhiteboard.h
 
-gaimincludedir=$(includedir)/gaim
-gaiminclude_HEADERS = \
+pidginincludedir=$(includedir)/pidgin
+pidgininclude_HEADERS = \
 	$(gaim_headers)
 
 
-gaim_DEPENDENCIES = @LIBOBJS@
-gaim_LDFLAGS = -export-dynamic
-gaim_LDADD = \
+pidgin_DEPENDENCIES = @LIBOBJS@
+pidgin_LDFLAGS = -export-dynamic
+pidgin_LDADD = \
 	@LIBOBJS@ \
 	$(DBUS_LIBS) \
 	$(GSTREAMER_LIBS) \
@@ -172,7 +172,7 @@
 	$(STARTUP_NOTIFICATION_LIBS) \
 	$(LIBXML_LIBS) \
 	$(GTK_LIBS) \
-	$(top_builddir)/libpurple/libgaim.la
+	$(top_builddir)/libpurple/libpurple.la
 
 if USE_INTERNAL_LIBGADU
 INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
@@ -181,7 +181,7 @@
 AM_CPPFLAGS = \
 	-DBR_PTHREADS=0 \
 	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)/gaim/\" \
+	-DLIBDIR=\"$(libdir)/pidgin/\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-I$(top_srcdir)/libpurple/ \
--- a/pidgin/plugins/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/pidgin/plugins/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -24,7 +24,7 @@
 	$(PERL_DIR) \
 	ticker
 
-plugindir = $(libdir)/gaim
+plugindir = $(libdir)/pidgin
 
 convcolors_la_LDFLAGS       = -module -avoid-version
 extplacement_la_LDFLAGS     = -module -avoid-version
--- a/pidgin/plugins/cap/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/pidgin/plugins/cap/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,10 +1,10 @@
-capdir = $(libdir)/gaim
+capdir = $(libdir)/pidgin
 
 cap_la_LDFLAGS = -module -avoid-version
 
 if PLUGINS
 
-cappixdir = $(datadir)/pixmaps/gaim/buttons
+cappixdir = $(datadir)/pixmaps/pidgin/buttons
 
 cap_LTLIBRARIES = cap.la
 
--- a/pidgin/plugins/gestures/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/pidgin/plugins/gestures/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/gaim
+plugindir = $(libdir)/pidgin
 
 gestures_la_LDFLAGS = -module -avoid-version
 
--- a/pidgin/plugins/ticker/Makefile.am	Mon Jan 29 03:45:21 2007 +0000
+++ b/pidgin/plugins/ticker/Makefile.am	Tue Jan 30 05:27:44 2007 +0000
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
 		Makefile.mingw
 
-plugindir = $(libdir)/gaim
+plugindir = $(libdir)/pidgin
 
 ticker_la_LDFLAGS = -module -avoid-version