# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1055661599 0
# Node ID d188b000e8920606771ce20bc145a0607aef86d3
# Parent  f5b0c607326482a6ce2522ce74f83d1e4097bd30
[gaim-migrate @ 6316]
There's now a gaim-remote.so (gaim plugin) and a libgaim-remote.so (library
for interfacing with an instance of gaim with gaim-remote.so loaded). The
gaim-remote tool links to the library, as does the plugin. Now there are
far too many things named gaim-remote. The Makefile should also work again.

committer: Tailor Script <tailor@pidgin.im>

diff -r f5b0c6073264 -r d188b000e892 plugins/gaim-remote/Makefile.am
--- a/plugins/gaim-remote/Makefile.am	Sun Jun 15 06:14:47 2003 +0000
+++ b/plugins/gaim-remote/Makefile.am	Sun Jun 15 07:19:59 2003 +0000
@@ -1,18 +1,28 @@
+grincludedir = $(includedir)/gaim-remote
+
 plugindir = $(libdir)/gaim
 
+lib_LTLIBRARIES = libgaim-remote.la
+
+grinclude_HEADERS = \
+	remote-socket.h \
+	remote.h
+
+libgaim_remote_la_SOURCES = remote-socket.c
+
+
 gaim_remote_la_LDFLAGS = -module -avoid-version
 
 if PLUGINS
 
 plugin_LTLIBRARIES = gaim-remote.la
 
-gaim_remote_la_SOURCES = \
-	remote.c \
-	remote-socket.c \
-	remote-socket.h
+gaim_remote_la_SOURCES = remote.c
+gaim_remote_la_LIBADD = -lgaim-remote
 
 endif
 
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/plugins \
diff -r f5b0c6073264 -r d188b000e892 plugins/gaim-remote/remote.c
--- a/plugins/gaim-remote/remote.c	Sun Jun 15 06:14:47 2003 +0000
+++ b/plugins/gaim-remote/remote.c	Sun Jun 15 07:19:59 2003 +0000
@@ -56,7 +56,7 @@
 static GSList *uis = NULL;
 
 /* AIM URI's ARE FUN :-D */
-const char *
+static const char *
 gaim_remote_handle_uri(const char *uri)
 {
 	const char *username;
diff -r f5b0c6073264 -r d188b000e892 plugins/gaim-remote/remote.h
--- a/plugins/gaim-remote/remote.h	Sun Jun 15 06:14:47 2003 +0000
+++ b/plugins/gaim-remote/remote.h	Sun Jun 15 07:19:59 2003 +0000
@@ -96,7 +96,4 @@
 #define CUI_REMOTE_JOIN_CHAT    10       /* Joins a chat. */
                               /* What else?? */
 
-
-const char *gaim_remote_handle_uri(const char *uri);
-
 #endif /* _GAIM_REMOTE_H_ */
diff -r f5b0c6073264 -r d188b000e892 src/Makefile.am
--- a/src/Makefile.am	Sun Jun 15 06:14:47 2003 +0000
+++ b/src/Makefile.am	Sun Jun 15 07:19:59 2003 +0000
@@ -90,7 +90,9 @@
 	gtkutils.h \
 	html.c \
 	idle.c \
+	internal.h \
 	log.c \
+	log.h \
 	main.c \
 	md5.c \
 	md5.h \
@@ -114,11 +116,12 @@
 	$(GTKSPELL_LIBS)
 
 gaim_remote_SOURCES = \
-	gaim-remote.c \
-	$(top_srcdir)/plugins/gaim-remote/remote-socket.c
+	gaim-remote.c
 
 gaim_remote_DEPENDENCIES = @LIBOBJS@
-gaim_remote_LDADD = @LIBOBJS@ $(GLIB_LIBS) $(INTLLIBS)
+gaim_remote_LDADD = \
+	@LIBOBJS@ $(GLIB_LIBS) $(INTLLIBS) \
+	-L$(top_builddir)/plugins/gaim-remote -lgaim-remote
 
 AM_CPPFLAGS = \
 	$(GTKSPELL_CFLAGS) \