Split libchime and libchimeprpl

Login code goes with libchimeprpl for now, until it gets fixed up.

diff --git a/Makefile.am b/Makefile.am
index 83213de901002f89a345c72e3fe12ef1a3e44803..2052d98bff5ee0cdc059088da1d15feb2fdc82c6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,32 +7,41 @@ endif
 
 AM_CPPFLAGS = @WFLAGS@
 
-plugin_LTLIBRARIES = libchime.la
+plugin_LTLIBRARIES = libchimeprpl.la
 
 WEBSOCKET_SRCS = chime-websocket-connection.c chime-websocket-connection.h chime-websocket.c
+
 PROTOBUF_SRCS = protobuf/auth_message.pb-c.c protobuf/auth_message.pb-c.h \
                protobuf/data_message.pb-c.c protobuf/data_message.pb-c.h \
                protobuf/rt_message.pb-c.c protobuf/rt_message.pb-c.h
-PRPL_SRCS = chime.h chime.c buddy.c rooms.c chat.c messages.c conversations.c meeting.c attachments.c
-LOGIN_SRCS = login.c login-amazon.c login-warpdrive.c login-private.h
-
-libchime_la_SOURCES = \
-       chime-connection.c chime-connection.h \
-       chime-contact.c chime-contact.h \
-       chime-room.c chime-room.h \
-       chime-conversation.c chime-conversation.h \
-       chime-object.c chime-object.h chime-props.h \
-       chime-call.c chime-call.h chime-call-audio.c \
-       chime-call-transport.c \
-       chime-juggernaut.c \
-       chime-meeting.c chime-meeting.h \
-       $(WEBSOCKET_SRCS) $(PROTOBUF_SRCS) $(PRPL_SRCS) $(LOGIN_SRCS)
-
-libchime_la_CFLAGS = $(PURPLE_CFLAGS) $(SOUP_CFLAGS) $(JSON_CFLAGS) $(LIBXML_CFLAGS) $(PROTOBUF_CFLAGS) $(OPUS_CFLAGS) $(FARSTREAM_CFLAGS) $(MARKDOWN_CFLAGS) $(GSTREAMER_CFLAGS)
-libchime_la_LIBADD = $(PURPLE_LIBS) $(SOUP_LIBS) $(JSON_LIBS) $(LIBXML_LIBS) $(PROTOBUF_LIBS) $(OPUS_LIBS) $(FARSTREAM_LIBS) $(MARKDOWN_LIBS) $(GSTREAMER_LIBS)
+
+PRPL_SRCS =    chime.h chime.c buddy.c rooms.c chat.c messages.c conversations.c meeting.c attachments.c
+
+LOGIN_SRCS =   login.c login-amazon.c login-warpdrive.c login-private.h
+
+CHIME_SRCS =   chime-connection.c chime-connection.h \
+               chime-contact.c chime-contact.h \
+               chime-room.c chime-room.h \
+               chime-conversation.c chime-conversation.h \
+               chime-object.c chime-object.h chime-props.h \
+               chime-call.c chime-call.h chime-call-audio.c \
+               chime-call-transport.c \
+               chime-juggernaut.c \
+               chime-meeting.c chime-meeting.h
+
+noinst_LTLIBRARIES = libchime.la
+
+libchime_la_SOURCES = $(CHIME_SRCS) $(WEBSOCKET_SRCS) $(PROTOBUF_SRCS)
+libchime_la_CFLAGS = $(PURPLE_CFLAGS) $(SOUP_CFLAGS) $(JSON_CFLAGS) $(LIBXML_CFLAGS) $(PROTOBUF_CFLAGS) $(MARKDOWN_CFLAGS) $(GSTREAMER_CFLAGS)
+libchime_la_LIBADD = $(PURPLE_LIBS) $(SOUP_LIBS) $(JSON_LIBS) $(LIBXML_LIBS) $(PROTOBUF_LIBS) $(MARKDOWN_LIBS) $(GSTREAMER_LIBS)
 libchime_la_LDFLAGS = -module -avoid-version -no-undefined
 
-POTFILES = $(libchime_la_SOURCES)
+libchimeprpl_la_SOURCES = $(PRPL_SRCS) $(LOGIN_SRCS)
+libchimeprpl_la_CFLAGS = $(PURPLE_CFLAGS) $(SOUP_CFLAGS) $(JSON_CFLAGS) $(LIBXML_CFLAGS) $(MARKDOWN_CFLAGS) $(GSTREAMER_CFLAGS)
+libchimeprpl_la_LIBADD = $(PURPLE_LIBS) $(SOUP_LIBS) $(JSON_LIBS) $(LIBXML_LIBS) $(MARKDOWN_LIBS) $(GSTREAMER_LIBS) libchime.la
+libchimeprpl_la_LDFLAGS = -module -avoid-version -no-undefined
+
+POTFILES = $(libchime_la_SOURCES) $(libchimeprpl_la_SOURCES)
 
 po/$(PACKAGE).pot: $(POTFILES)
        @echo "Regenerating $@" ; rm -f $@ && \

diff --git a/README b/README
index 71db8d88c9828e4e83ea2045c93ce6b216eb4675..6d5fcb2b2ac7599eac5e830852cdf73c4cf73f1b 100644 (file)
--- a/README
+++ b/README
@@ -25,8 +25,8 @@ $ make
 $ sudo make install
 
 Given the rate of development, you may find it easier to make a symbolic
-link from the installed plugin (e.g. /usr/lib64/purple-2/libchime.so) to
-.libs/libchime.so in your working tree.
+link from the installed plugin (e.g. /usr/lib64/purple-2/libchimeprpl.so) to
+.libs/libchimeprpl.so in your working tree.
 
 
     ==============