move aur-websocket-parser to common

thaytan · Apr 21, 2015 · 7f33389 · 7f33389
1 parent 5802c65
commit 7f33389
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -10,7 +10,8 @@ if BUILD_GTKAPPS
 bin_PROGRAMS += aurena-simple-client-fullscreen aurena-simple-controller
 endif
 
-COMMON_SOURCES = common/aur-json.c common/aur-json.h common/aur-types.h
+COMMON_SOURCES = common/aur-json.c common/aur-json.h common/aur-types.h \
+  common/aur-websocket-parser.c common/aur-websocket-parser.h 
 
 aurena_server_CPPFLAGS = -I$(top_srcdir) $(AUR_COMMON_CFLAGS) $(AUR_SERVER_CFLAGS) $(GST_RTSP_CFLAGS) $(GST_CFLAGS) $(EXTRA_CFLAGS)
 aurena_server_LDADD = server/libaurena_server.la $(AUR_COMMON_LIBS) $(AUR_SERVER_LIBS) $(GST_RTSP_LIBS) $(GST_LIBS)

diff --git a/src/server/aur-websocket-parser.c → src/common/aur-websocket-parser.c b/src/server/aur-websocket-parser.c → src/common/aur-websocket-parser.c
diff --git a/src/server/aur-websocket-parser.h → src/common/aur-websocket-parser.h b/src/server/aur-websocket-parser.h → src/common/aur-websocket-parser.h
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
@@ -16,9 +16,7 @@ libaurena_server_la_SOURCES = \
     aur-server.c \
     aur-server.h \
     aur-server-client.c \
-    aur-server-client.h \
-    aur-websocket-parser.c \
-    aur-websocket-parser.h
+    aur-server-client.h
 
 libaurena_server_la_CPPFLAGS = -I$(top_srcdir) $(AUR_COMMON_CFLAGS) $(GST_CFLAGS) $(GST_RTSP_CFLAGS) $(EXTRA_CFLAGS)
 libaurena_server_la_LIBADD  =
diff --git a/src/server/aur-server-client.h b/src/server/aur-server-client.h
@@ -25,7 +25,7 @@
 #include <libsoup/soup.h>
 
 #include <src/common/aur-types.h>
-#include <src/server/aur-websocket-parser.h>
+#include <src/common/aur-websocket-parser.h>
 
 G_BEGIN_DECLS