Move Chime core sources to chime/

diff --git a/Makefile.am b/Makefile.am
index 2052d98bff5ee0cdc059088da1d15feb2fdc82c6..911a0a6f785bef764cf9248c3521531196c20492 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,6 @@ AM_CPPFLAGS = @WFLAGS@
 
 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
@@ -19,25 +17,27 @@ PRPL_SRCS = chime.h chime.c buddy.c rooms.c chat.c messages.c conversations.c me
 
 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
+WEBSOCKET_SRCS = chime/chime-websocket-connection.c chime/chime-websocket-connection.h chime/chime-websocket.c
+
+CHIME_SRCS =   chime/chime-connection.c chime/chime-connection.h \
+               chime/chime-contact.c chime/chime-contact.h \
+               chime/chime-room.c chime/chime-room.h \
+               chime/chime-conversation.c chime/chime-conversation.h \
+               chime/chime-object.c chime/chime-object.h chime/chime-props.h \
+               chime/chime-call.c chime/chime-call.h chime/chime-call-audio.c \
+               chime/chime-call-transport.c \
+               chime/chime-juggernaut.c \
+               chime/chime-meeting.c chime/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_CFLAGS = $(PURPLE_CFLAGS) $(SOUP_CFLAGS) $(JSON_CFLAGS) $(LIBXML_CFLAGS) $(PROTOBUF_CFLAGS) $(MARKDOWN_CFLAGS) $(GSTREAMER_CFLAGS) -Ichime
 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
 
 libchimeprpl_la_SOURCES = $(PRPL_SRCS) $(LOGIN_SRCS)
-libchimeprpl_la_CFLAGS = $(PURPLE_CFLAGS) $(SOUP_CFLAGS) $(JSON_CFLAGS) $(LIBXML_CFLAGS) $(MARKDOWN_CFLAGS) $(GSTREAMER_CFLAGS)
+libchimeprpl_la_CFLAGS = $(PURPLE_CFLAGS) $(SOUP_CFLAGS) $(JSON_CFLAGS) $(LIBXML_CFLAGS) $(MARKDOWN_CFLAGS) $(GSTREAMER_CFLAGS) -Ichime
 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
 
@@ -51,11 +51,11 @@ po/$(PACKAGE).pot: $(POTFILES)
          --msgid-bugs-address=dwmw2@infradead.org \
          -o $@ $(POTFILES)
 
-chime-call-transport.h: protobuf/auth_message.pb-c.h
-chime-call-transport.h: protobuf/rt_message.pb-c.h
-chime-call-transport.h: protobuf/data_message.pb-c.h
+chime/chime-call-transport.h: protobuf/auth_message.pb-c.h
+chime/chime-call-transport.h: protobuf/rt_message.pb-c.h
+chime/chime-call-transport.h: protobuf/data_message.pb-c.h
 
-chime-call-transport.c chime-call-audio.c chime-call.c: chime-call-transport.h
+chime/chime-call-transport.c chime/chime-call-audio.c chime/chime-call.c: chime/chime-call-transport.h
 
 %.pb-c.c %.pb-c.h: %.proto
        $(PROTOC) $< --c_out .

diff --git a/chime-call-audio.c b/chime/chime-call-audio.c
similarity index 100%
rename from chime-call-audio.c
rename to chime/chime-call-audio.c

diff --git a/chime-call-audio.h b/chime/chime-call-audio.h
similarity index 100%
rename from chime-call-audio.h
rename to chime/chime-call-audio.h

diff --git a/chime-call-transport.c b/chime/chime-call-transport.c
similarity index 100%
rename from chime-call-transport.c
rename to chime/chime-call-transport.c

diff --git a/chime-call.c b/chime/chime-call.c
similarity index 100%
rename from chime-call.c
rename to chime/chime-call.c

diff --git a/chime-call.h b/chime/chime-call.h
similarity index 100%
rename from chime-call.h
rename to chime/chime-call.h

diff --git a/chime-connection-private.h b/chime/chime-connection-private.h
similarity index 100%
rename from chime-connection-private.h
rename to chime/chime-connection-private.h

diff --git a/chime-connection.c b/chime/chime-connection.c
similarity index 100%
rename from chime-connection.c
rename to chime/chime-connection.c

diff --git a/chime-connection.h b/chime/chime-connection.h
similarity index 100%
rename from chime-connection.h
rename to chime/chime-connection.h

diff --git a/chime-contact.c b/chime/chime-contact.c
similarity index 100%
rename from chime-contact.c
rename to chime/chime-contact.c

diff --git a/chime-contact.h b/chime/chime-contact.h
similarity index 100%
rename from chime-contact.h
rename to chime/chime-contact.h

diff --git a/chime-conversation.c b/chime/chime-conversation.c
similarity index 100%
rename from chime-conversation.c
rename to chime/chime-conversation.c

diff --git a/chime-conversation.h b/chime/chime-conversation.h
similarity index 100%
rename from chime-conversation.h
rename to chime/chime-conversation.h

diff --git a/chime-juggernaut.c b/chime/chime-juggernaut.c
similarity index 100%
rename from chime-juggernaut.c
rename to chime/chime-juggernaut.c

diff --git a/chime-meeting.c b/chime/chime-meeting.c
similarity index 100%
rename from chime-meeting.c
rename to chime/chime-meeting.c

diff --git a/chime-meeting.h b/chime/chime-meeting.h
similarity index 100%
rename from chime-meeting.h
rename to chime/chime-meeting.h

diff --git a/chime-object.c b/chime/chime-object.c
similarity index 100%
rename from chime-object.c
rename to chime/chime-object.c

diff --git a/chime-object.h b/chime/chime-object.h
similarity index 100%
rename from chime-object.h
rename to chime/chime-object.h

diff --git a/chime-props.h b/chime/chime-props.h
similarity index 100%
rename from chime-props.h
rename to chime/chime-props.h

diff --git a/chime-room.c b/chime/chime-room.c
similarity index 100%
rename from chime-room.c
rename to chime/chime-room.c

diff --git a/chime-room.h b/chime/chime-room.h
similarity index 100%
rename from chime-room.h
rename to chime/chime-room.h

diff --git a/chime-websocket-connection.c b/chime/chime-websocket-connection.c
similarity index 100%
rename from chime-websocket-connection.c
rename to chime/chime-websocket-connection.c

diff --git a/chime-websocket-connection.h b/chime/chime-websocket-connection.h
similarity index 100%
rename from chime-websocket-connection.h
rename to chime/chime-websocket-connection.h

diff --git a/chime-websocket.c b/chime/chime-websocket.c
similarity index 100%
rename from chime-websocket.c
rename to chime/chime-websocket.c